cleaned up issues with K8s deployments

k8s/deployServices.cmd → deployK8sServices.cmd

@@ -1,7 +1,7 @@
 @echo off
 REM deploys all Kubernetes services
 
-for %%f in (*.yaml) do (
+for %%f in (k8s/*.yaml) do (
     echo "Deploying %%~nxf"
-    kubectl apply -f "%%~nxf"
+    kubectl apply -f "k8s/%%~nxf"
 )

k8s/lighthouse-deploy.yaml

@@ -1,7 +1,13 @@
 apiVersion: v1
+kind: Namespace
+metadata:
+  name: akka-cqrs
+---
+apiVersion: v1
 kind: Service
 metadata:
   name: lighthouse
+  namespace: akka-cqrs
   labels:
     app: lighthouse
 spec:
@@ -14,12 +20,13 @@ spec:
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
+  namespace: akka-cqrs
   name: lighthouse
   labels:
     app: lighthouse
 spec:
   serviceName: lighthouse
-  replicas: 3
+  replicas: 2
   selector:
     matchLabels:
       app: lighthouse

k8s/mongodb-deploy.yaml

@@ -1,6 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
+  namespace: akka-cqrs
   name: mongodb
 spec:
   ports:
@@ -11,6 +12,7 @@ spec:
 apiVersion: apps/v1beta1
 kind: Deployment
 metadata:
+  namespace: akka-cqrs
   name: mongodb
 spec:
   replicas: 1

k8s/jaeger-all-in-one.yaml → k8s/phobos/jaeger-all-in-one.yaml

@@ -18,6 +18,7 @@ items:
 - apiVersion: extensions/v1beta1
   kind: Deployment
   metadata:
+    namespace: akka-cqrs
     name: jaeger
     labels:
       app: jaeger
@@ -64,6 +65,7 @@ items:
 - apiVersion: v1
   kind: Service
   metadata:
+    namespace: akka-cqrs
     name: jaeger-query
     labels:
       app: jaeger
@@ -72,7 +74,7 @@ items:
   spec:
     ports:
       - name: query-http
-        port: 80
+        port: 8881
         protocol: TCP
         targetPort: 16686
     selector:
@@ -82,6 +84,7 @@ items:
 - apiVersion: v1
   kind: Service
   metadata:
+    namespace: akka-cqrs
     name: jaeger-collector
     labels:
       app: jaeger
@@ -108,6 +111,7 @@ items:
 - apiVersion: v1
   kind: Service
   metadata:
+    namespace: akka-cqrs
     name: jaeger-agent
     labels:
       app: jaeger

k8s/statsd-deploy.yaml → k8s/phobos/statsd-deploy.yaml

@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: statsd-agent
+  namespace: akka-cqrs
   labels:
     app: statsd
 spec:
@@ -25,6 +26,7 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
+  namespace: akka-cqrs
   name: graphite-http
   labels:
     app: statsd
@@ -41,6 +43,7 @@ spec:
 apiVersion: apps/v1beta1
 kind: Deployment
 metadata:
+  namespace: akka-cqrs
   name: statsd
   labels:
     app: statsd

k8s/pricing-deploy.yaml

@@ -1,6 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
+  namespace: akka-cqrs
   name: pricing
   labels:
     app: pricing
@@ -14,12 +15,13 @@ spec:
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
+  amespace: akka-cqrs
   name: pricing
   labels:
     app: pricing
 spec:
   serviceName: pricing
-  replicas: 3
+  replicas: 2
   selector:
     matchLabels:
       app: pricing

k8s/pricing-web-deploy.yaml

@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: pricing-web
+  namespace: akka-cqrs
   labels:
     app: pricing-web
 spec:
@@ -11,31 +12,34 @@ spec:
   selector:
     app: pricing-web
 ---
-- apiVersion: v1
-  kind: Service
-  metadata:
-    name: pricing-ui
-    labels:
-      app: pricing-web
-  spec:
-    ports:
-      - name: query-http
-        port: 8999
-        protocol: TCP
-        targetPort: 80
-    selector:
-      app: pricing-web
-    type: LoadBalancer
+apiVersion: v1
+kind: Service
+metadata:
+  namespace: akka-cqrs
+  name: pricing-ui
+  labels:
+    app: pricing-web
+spec:
+  ports:
+    - name: query-http
+      port: 80
+      protocol: TCP
+      targetPort: 80
+  selector:
+    app: pricing-web
+  type: LoadBalancer
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  namespace: akka-cqrs
   name: pricing-web
   labels:
     app: pricing-web
 spec:
-  serviceName: pricing-web
-  replicas: 3
+  strategy:
+      type: Recreate
+  replicas: 2
   selector:
     matchLabels:
       app: pricing-web
@@ -58,7 +62,7 @@ spec:
             fieldRef:
               fieldPath: metadata.name
         - name: CLUSTER_IP
-          value: "$(POD_NAME).web-pricing"
+          value: "$(POD_NAME).pricing-web"
         - name: CLUSTER_SEEDS
           value: akka.tcp://AkkaTrader@pricing-0.pricing:5110,akka.tcp://AkkaTrader@pricing-1.pricing:5110,akka.tcp://AkkaTrader@pricing-2.pricing:5110
         livenessProbe:

k8s/tradeprocessor-deploy.yaml

@@ -1,6 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
+  namespace: akka-cqrs
   name: trade-processor
   labels:
     app: trade-processor
@@ -14,12 +15,13 @@ spec:
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
+  namespace: akka-cqrs
   name: trade-processor
   labels:
     app: trade-processor
 spec:
   serviceName: trade-processor
-  replicas: 3
+  replicas: 2
   selector:
     matchLabels:
       app: trade-processor

k8s/traders-deploy.yaml

@@ -1,6 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
+  namespace: akka-cqrs
   name: traders
   labels:
     app: traders
@@ -14,12 +15,13 @@ spec:
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
+  namespace: akka-cqrs
   name: traders
   labels:
     app: traders
 spec:
   serviceName: traders
-  replicas: 3
+  replicas: 2
   selector:
     matchLabels:
       app: traders

stopK8sServices.cmd

@@ -0,0 +1,4 @@
+@echo off
+REM destroys all K8s services
+
+kubectl -n akka-cqrs delete statefulsets,deployments,po,svc --all