From 7b9d73e19fa2e463a1d6a886a5d046332dc6de50 Mon Sep 17 00:00:00 2001
From: Aaron Stannard <aaron@petabridge.com>
Date: Sun, 26 May 2019 13:14:14 -0500
Subject: [PATCH 1/5] cleaned up issues with K8s deployments

---
 ...eployServices.cmd => deployK8sServices.cmd |  4 +-
 k8s/lighthouse-deploy.yaml                    |  7 ++++
 k8s/mongodb-deploy.yaml                       |  2 +
 k8s/{ => phobos}/jaeger-all-in-one.yaml       |  2 +-
 k8s/{ => phobos}/statsd-deploy.yaml           |  0
 k8s/pricing-web-deploy.yaml                   | 38 ++++++++++---------
 k8s/tradeprocessor-deploy.yaml                |  2 +
 k8s/traders-deploy.yaml                       |  2 +
 stopK8sServices.cmd                           |  4 ++
 9 files changed, 41 insertions(+), 20 deletions(-)
 rename k8s/deployServices.cmd => deployK8sServices.cmd (54%)
 rename k8s/{ => phobos}/jaeger-all-in-one.yaml (99%)
 rename k8s/{ => phobos}/statsd-deploy.yaml (100%)
 create mode 100644 stopK8sServices.cmd

diff --git a/k8s/deployServices.cmd b/deployK8sServices.cmd
similarity index 54%
rename from k8s/deployServices.cmd
rename to deployK8sServices.cmd
index de9e4bae..b4dff16c 100644
--- a/k8s/deployServices.cmd
+++ b/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"
 )
\ No newline at end of file
diff --git a/k8s/lighthouse-deploy.yaml b/k8s/lighthouse-deploy.yaml
index be21728c..77081f71 100644
--- a/k8s/lighthouse-deploy.yaml
+++ b/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,6 +20,7 @@ spec:
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
+  namespace: akka-cqrs
   name: lighthouse
   labels:
     app: lighthouse
diff --git a/k8s/mongodb-deploy.yaml b/k8s/mongodb-deploy.yaml
index e5ce9a2b..4536ca20 100644
--- a/k8s/mongodb-deploy.yaml
+++ b/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
diff --git a/k8s/jaeger-all-in-one.yaml b/k8s/phobos/jaeger-all-in-one.yaml
similarity index 99%
rename from k8s/jaeger-all-in-one.yaml
rename to k8s/phobos/jaeger-all-in-one.yaml
index 0cb92596..10959fb6 100644
--- a/k8s/jaeger-all-in-one.yaml
+++ b/k8s/phobos/jaeger-all-in-one.yaml
@@ -72,7 +72,7 @@ items:
   spec:
     ports:
       - name: query-http
-        port: 80
+        port: 8881
         protocol: TCP
         targetPort: 16686
     selector:
diff --git a/k8s/statsd-deploy.yaml b/k8s/phobos/statsd-deploy.yaml
similarity index 100%
rename from k8s/statsd-deploy.yaml
rename to k8s/phobos/statsd-deploy.yaml
diff --git a/k8s/pricing-web-deploy.yaml b/k8s/pricing-web-deploy.yaml
index 6d924e30..70e2c4c6 100644
--- a/k8s/pricing-web-deploy.yaml
+++ b/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,30 +12,33 @@ 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
+  strategy:
+      type: Recreate
   replicas: 3
   selector:
     matchLabels:
@@ -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:
diff --git a/k8s/tradeprocessor-deploy.yaml b/k8s/tradeprocessor-deploy.yaml
index 7ed68ac4..0706d2f6 100644
--- a/k8s/tradeprocessor-deploy.yaml
+++ b/k8s/tradeprocessor-deploy.yaml
@@ -1,6 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
+  namespace: akka-cqrs
   name: trade-processor
   labels:
     app: trade-processor
@@ -14,6 +15,7 @@ spec:
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
+  namespace: akka-cqrs
   name: trade-processor
   labels:
     app: trade-processor
diff --git a/k8s/traders-deploy.yaml b/k8s/traders-deploy.yaml
index bd656877..56b454dc 100644
--- a/k8s/traders-deploy.yaml
+++ b/k8s/traders-deploy.yaml
@@ -1,6 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
+  namespace: akka-cqrs
   name: traders
   labels:
     app: traders
@@ -14,6 +15,7 @@ spec:
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
+  namespace: akka-cqrs
   name: traders
   labels:
     app: traders
diff --git a/stopK8sServices.cmd b/stopK8sServices.cmd
new file mode 100644
index 00000000..40986533
--- /dev/null
+++ b/stopK8sServices.cmd
@@ -0,0 +1,4 @@
+@echo off
+REM destroys all K8s services
+
+kubectl -n akka-cqrs delete statefulsets,deployments,po,svc --all    
\ No newline at end of file

From a3266f243b6240939988cda4860b56bdda46629c Mon Sep 17 00:00:00 2001
From: Aaron Stannard <aaron@petabridge.com>
Date: Sun, 26 May 2019 13:28:04 -0500
Subject: [PATCH 2/5] fixed deployment scripts

---
 k8s/lighthouse-deploy.yaml                              | 7 -------
 k8s/mongodb-deploy.yaml                                 | 2 --
 k8s/pricing-web-deploy.yaml                             | 3 ---
 k8s/tradeprocessor-deploy.yaml                          | 2 --
 k8s/traders-deploy.yaml                                 | 2 --
 src/Akka.CQRS.Pricing.Web/Actors/StockPublisherActor.cs | 2 +-
 6 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/k8s/lighthouse-deploy.yaml b/k8s/lighthouse-deploy.yaml
index 77081f71..be21728c 100644
--- a/k8s/lighthouse-deploy.yaml
+++ b/k8s/lighthouse-deploy.yaml
@@ -1,13 +1,7 @@
 apiVersion: v1
-kind: Namespace
-metadata:
-  name: akka-cqrs
----
-apiVersion: v1
 kind: Service
 metadata:
   name: lighthouse
-  namespace: akka-cqrs
   labels:
     app: lighthouse
 spec:
@@ -20,7 +14,6 @@ spec:
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  namespace: akka-cqrs
   name: lighthouse
   labels:
     app: lighthouse
diff --git a/k8s/mongodb-deploy.yaml b/k8s/mongodb-deploy.yaml
index 4536ca20..e5ce9a2b 100644
--- a/k8s/mongodb-deploy.yaml
+++ b/k8s/mongodb-deploy.yaml
@@ -1,7 +1,6 @@
 apiVersion: v1
 kind: Service
 metadata:
-  namespace: akka-cqrs
   name: mongodb
 spec:
   ports:
@@ -12,7 +11,6 @@ spec:
 apiVersion: apps/v1beta1
 kind: Deployment
 metadata:
-  namespace: akka-cqrs
   name: mongodb
 spec:
   replicas: 1
diff --git a/k8s/pricing-web-deploy.yaml b/k8s/pricing-web-deploy.yaml
index 70e2c4c6..fcb7b18a 100644
--- a/k8s/pricing-web-deploy.yaml
+++ b/k8s/pricing-web-deploy.yaml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: pricing-web
-  namespace: akka-cqrs
   labels:
     app: pricing-web
 spec:
@@ -15,7 +14,6 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  namespace: akka-cqrs
   name: pricing-ui
   labels:
     app: pricing-web
@@ -32,7 +30,6 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  namespace: akka-cqrs
   name: pricing-web
   labels:
     app: pricing-web
diff --git a/k8s/tradeprocessor-deploy.yaml b/k8s/tradeprocessor-deploy.yaml
index 0706d2f6..7ed68ac4 100644
--- a/k8s/tradeprocessor-deploy.yaml
+++ b/k8s/tradeprocessor-deploy.yaml
@@ -1,7 +1,6 @@
 apiVersion: v1
 kind: Service
 metadata:
-  namespace: akka-cqrs
   name: trade-processor
   labels:
     app: trade-processor
@@ -15,7 +14,6 @@ spec:
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  namespace: akka-cqrs
   name: trade-processor
   labels:
     app: trade-processor
diff --git a/k8s/traders-deploy.yaml b/k8s/traders-deploy.yaml
index 56b454dc..bd656877 100644
--- a/k8s/traders-deploy.yaml
+++ b/k8s/traders-deploy.yaml
@@ -1,7 +1,6 @@
 apiVersion: v1
 kind: Service
 metadata:
-  namespace: akka-cqrs
   name: traders
   labels:
     app: traders
@@ -15,7 +14,6 @@ spec:
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  namespace: akka-cqrs
   name: traders
   labels:
     app: traders
diff --git a/src/Akka.CQRS.Pricing.Web/Actors/StockPublisherActor.cs b/src/Akka.CQRS.Pricing.Web/Actors/StockPublisherActor.cs
index 6ef9bfdb..3c2db27e 100644
--- a/src/Akka.CQRS.Pricing.Web/Actors/StockPublisherActor.cs
+++ b/src/Akka.CQRS.Pricing.Web/Actors/StockPublisherActor.cs
@@ -34,7 +34,7 @@ public StockPublisherActor(StockHubHelper hub)
                 }
             });
 
-            ReceiveAsync <IVolumeUpdate>(async p =>
+            ReceiveAsync<IVolumeUpdate>(async p =>
             {
                 try
                 {

From a92e71f74a5541cbd30986445d7fd9c197812e2f Mon Sep 17 00:00:00 2001
From: Aaron Stannard <aaron@petabridge.com>
Date: Sun, 26 May 2019 13:37:51 -0500
Subject: [PATCH 3/5] reduced cluster size

---
 k8s/lighthouse-deploy.yaml     | 2 +-
 k8s/pricing-deploy.yaml        | 2 +-
 k8s/pricing-web-deploy.yaml    | 2 +-
 k8s/tradeprocessor-deploy.yaml | 2 +-
 k8s/traders-deploy.yaml        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/k8s/lighthouse-deploy.yaml b/k8s/lighthouse-deploy.yaml
index be21728c..ea42ace8 100644
--- a/k8s/lighthouse-deploy.yaml
+++ b/k8s/lighthouse-deploy.yaml
@@ -19,7 +19,7 @@ metadata:
     app: lighthouse
 spec:
   serviceName: lighthouse
-  replicas: 3
+  replicas: 2
   selector:
     matchLabels:
       app: lighthouse
diff --git a/k8s/pricing-deploy.yaml b/k8s/pricing-deploy.yaml
index 3a8e973e..578b3ddf 100644
--- a/k8s/pricing-deploy.yaml
+++ b/k8s/pricing-deploy.yaml
@@ -19,7 +19,7 @@ metadata:
     app: pricing
 spec:
   serviceName: pricing
-  replicas: 3
+  replicas: 2
   selector:
     matchLabels:
       app: pricing
diff --git a/k8s/pricing-web-deploy.yaml b/k8s/pricing-web-deploy.yaml
index fcb7b18a..1fd46bde 100644
--- a/k8s/pricing-web-deploy.yaml
+++ b/k8s/pricing-web-deploy.yaml
@@ -36,7 +36,7 @@ metadata:
 spec:
   strategy:
       type: Recreate
-  replicas: 3
+  replicas: 2
   selector:
     matchLabels:
       app: pricing-web
diff --git a/k8s/tradeprocessor-deploy.yaml b/k8s/tradeprocessor-deploy.yaml
index 7ed68ac4..6c6cc7f1 100644
--- a/k8s/tradeprocessor-deploy.yaml
+++ b/k8s/tradeprocessor-deploy.yaml
@@ -19,7 +19,7 @@ metadata:
     app: trade-processor
 spec:
   serviceName: trade-processor
-  replicas: 3
+  replicas: 2
   selector:
     matchLabels:
       app: trade-processor
diff --git a/k8s/traders-deploy.yaml b/k8s/traders-deploy.yaml
index bd656877..b8861e90 100644
--- a/k8s/traders-deploy.yaml
+++ b/k8s/traders-deploy.yaml
@@ -19,7 +19,7 @@ metadata:
     app: traders
 spec:
   serviceName: traders
-  replicas: 3
+  replicas: 2
   selector:
     matchLabels:
       app: traders

From 229891220c0f65dac2f873ec643dcf26da5ab8b5 Mon Sep 17 00:00:00 2001
From: Aaron Stannard <aaron@petabridge.com>
Date: Sun, 26 May 2019 13:38:01 -0500
Subject: [PATCH 4/5] Revert "fixed deployment scripts"

This reverts commit a3266f243b6240939988cda4860b56bdda46629c.
---
 k8s/lighthouse-deploy.yaml                              | 7 +++++++
 k8s/mongodb-deploy.yaml                                 | 2 ++
 k8s/pricing-web-deploy.yaml                             | 3 +++
 k8s/tradeprocessor-deploy.yaml                          | 2 ++
 k8s/traders-deploy.yaml                                 | 2 ++
 src/Akka.CQRS.Pricing.Web/Actors/StockPublisherActor.cs | 2 +-
 6 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/k8s/lighthouse-deploy.yaml b/k8s/lighthouse-deploy.yaml
index ea42ace8..e3db0dfd 100644
--- a/k8s/lighthouse-deploy.yaml
+++ b/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,6 +20,7 @@ spec:
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
+  namespace: akka-cqrs
   name: lighthouse
   labels:
     app: lighthouse
diff --git a/k8s/mongodb-deploy.yaml b/k8s/mongodb-deploy.yaml
index e5ce9a2b..4536ca20 100644
--- a/k8s/mongodb-deploy.yaml
+++ b/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
diff --git a/k8s/pricing-web-deploy.yaml b/k8s/pricing-web-deploy.yaml
index 1fd46bde..67fb7155 100644
--- a/k8s/pricing-web-deploy.yaml
+++ b/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:
@@ -14,6 +15,7 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
+  namespace: akka-cqrs
   name: pricing-ui
   labels:
     app: pricing-web
@@ -30,6 +32,7 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  namespace: akka-cqrs
   name: pricing-web
   labels:
     app: pricing-web
diff --git a/k8s/tradeprocessor-deploy.yaml b/k8s/tradeprocessor-deploy.yaml
index 6c6cc7f1..949a2985 100644
--- a/k8s/tradeprocessor-deploy.yaml
+++ b/k8s/tradeprocessor-deploy.yaml
@@ -1,6 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
+  namespace: akka-cqrs
   name: trade-processor
   labels:
     app: trade-processor
@@ -14,6 +15,7 @@ spec:
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
+  namespace: akka-cqrs
   name: trade-processor
   labels:
     app: trade-processor
diff --git a/k8s/traders-deploy.yaml b/k8s/traders-deploy.yaml
index b8861e90..1a3022f0 100644
--- a/k8s/traders-deploy.yaml
+++ b/k8s/traders-deploy.yaml
@@ -1,6 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
+  namespace: akka-cqrs
   name: traders
   labels:
     app: traders
@@ -14,6 +15,7 @@ spec:
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
+  namespace: akka-cqrs
   name: traders
   labels:
     app: traders
diff --git a/src/Akka.CQRS.Pricing.Web/Actors/StockPublisherActor.cs b/src/Akka.CQRS.Pricing.Web/Actors/StockPublisherActor.cs
index 3c2db27e..6ef9bfdb 100644
--- a/src/Akka.CQRS.Pricing.Web/Actors/StockPublisherActor.cs
+++ b/src/Akka.CQRS.Pricing.Web/Actors/StockPublisherActor.cs
@@ -34,7 +34,7 @@ public StockPublisherActor(StockHubHelper hub)
                 }
             });
 
-            ReceiveAsync<IVolumeUpdate>(async p =>
+            ReceiveAsync <IVolumeUpdate>(async p =>
             {
                 try
                 {

From 33d639bedba420ae2205dcb79e413797c09afe6c Mon Sep 17 00:00:00 2001
From: Aaron Stannard <aaron@petabridge.com>
Date: Sun, 26 May 2019 13:42:34 -0500
Subject: [PATCH 5/5] fixed YAML

---
 k8s/phobos/jaeger-all-in-one.yaml | 4 ++++
 k8s/phobos/statsd-deploy.yaml     | 3 +++
 k8s/pricing-deploy.yaml           | 2 ++
 3 files changed, 9 insertions(+)

diff --git a/k8s/phobos/jaeger-all-in-one.yaml b/k8s/phobos/jaeger-all-in-one.yaml
index 10959fb6..f236c2e7 100644
--- a/k8s/phobos/jaeger-all-in-one.yaml
+++ b/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
@@ -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
diff --git a/k8s/phobos/statsd-deploy.yaml b/k8s/phobos/statsd-deploy.yaml
index ddee305d..3eb6f604 100644
--- a/k8s/phobos/statsd-deploy.yaml
+++ b/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
diff --git a/k8s/pricing-deploy.yaml b/k8s/pricing-deploy.yaml
index 578b3ddf..105d6bcc 100644
--- a/k8s/pricing-deploy.yaml
+++ b/k8s/pricing-deploy.yaml
@@ -1,6 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
+  namespace: akka-cqrs
   name: pricing
   labels:
     app: pricing
@@ -14,6 +15,7 @@ spec:
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
+  amespace: akka-cqrs
   name: pricing
   labels:
     app: pricing