From 8b0719234cba7a29562baa852eb3908608375f35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lauri=20V=C3=B5sandi?= <lauri@k-space.ee>
Date: Thu, 18 May 2023 22:55:40 +0300
Subject: [PATCH] camtiler: Updates

---
 camtiler/README.md       |  2 +-
 camtiler/application.yml |  4 ++--
 camtiler/logmower.yml    | 44 +++++++++++++++++++++++++++++++++++++++-
 camtiler/minio.yml       |  4 ++--
 camtiler/mongodb.yml     |  2 +-
 5 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/camtiler/README.md b/camtiler/README.md
index 56b677e..ef18c22 100644
--- a/camtiler/README.md
+++ b/camtiler/README.md
@@ -3,7 +3,7 @@ To apply changes:
 ```
 kubectl apply -n camtiler \
   -f application.yml \
-  -f persistence.yml \
+  -f minio.yml \
   -f mongoexpress.yml \
   -f mongodb-support.yml \
   -f camera-tiler.yml \
diff --git a/camtiler/application.yml b/camtiler/application.yml
index e79a7f4..6990673 100644
--- a/camtiler/application.yml
+++ b/camtiler/application.yml
@@ -200,12 +200,12 @@ spec:
                           operator: In
                           values:
                             - foobar
-                    topologyKey: kubernetes.io/hostname
+                    topologyKey: topology.kubernetes.io/zone
 
             # Make sure camera deployments are spread over workers
             topologySpreadConstraints:
               - maxSkew: 1
-                topologyKey: kubernetes.io/hostname
+                topologyKey: topology.kubernetes.io/zone
                 whenUnsatisfiable: DoNotSchedule
                 labelSelector:
                   matchLabels:
diff --git a/camtiler/logmower.yml b/camtiler/logmower.yml
index e21a146..42317b5 100644
--- a/camtiler/logmower.yml
+++ b/camtiler/logmower.yml
@@ -14,6 +14,27 @@ spec:
     metadata:
       labels: *selectorLabels
     spec:
+      affinity:
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - labelSelector:
+                matchExpressions:
+                  - key: app.kubernetes.io/name
+                    operator: In
+                    values:
+                      - camtiler
+                  - key: component
+                    operator: In
+                    values:
+                      - logmower-eventsource
+              topologyKey: topology.kubernetes.io/zone
+      nodeSelector:
+        dedicated: storage
+      tolerations:
+        - key: dedicated
+          operator: Equal
+          value: storage
+          effect: NoSchedule
       containers:
         - name: logmower-eventsource
           image: harbor.k-space.ee/k-space/logmower-eventsource
@@ -39,7 +60,7 @@ metadata:
   name: logmower-event-broker
 spec:
   revisionHistoryLimit: 0
-  replicas: 5
+  replicas: 2
   selector:
     matchLabels: &selectorLabels
       app.kubernetes.io/name: camtiler
@@ -48,6 +69,27 @@ spec:
     metadata:
       labels: *selectorLabels
     spec:
+      affinity:
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - labelSelector:
+                matchExpressions:
+                  - key: app.kubernetes.io/name
+                    operator: In
+                    values:
+                      - camtiler
+                  - key: component
+                    operator: In
+                    values:
+                      - logmower-event-broker
+              topologyKey: topology.kubernetes.io/zone
+      nodeSelector:
+        dedicated: storage
+      tolerations:
+        - key: dedicated
+          operator: Equal
+          value: storage
+          effect: NoSchedule
       containers:
         - name: logmower-event-broker
           image: harbor.k-space.ee/k-space/camera-event-broker
diff --git a/camtiler/minio.yml b/camtiler/minio.yml
index fdaa647..1645724 100644
--- a/camtiler/minio.yml
+++ b/camtiler/minio.yml
@@ -22,11 +22,11 @@ spec:
           requiredDuringSchedulingIgnoredDuringExecution:
             - labelSelector:
                 matchExpressions:
-                  - key: app
+                  - key: app.kubernetes.io/name
                     operator: In
                     values:
                       - minio
-              topologyKey: kubernetes.io/hostname
+              topologyKey: topology.kubernetes.io/zone
       nodeSelector:
         dedicated: storage
       tolerations:
diff --git a/camtiler/mongodb.yml b/camtiler/mongodb.yml
index 73959f2..e56ee8d 100644
--- a/camtiler/mongodb.yml
+++ b/camtiler/mongodb.yml
@@ -63,7 +63,7 @@ spec:
                         operator: In
                         values:
                           - mongodb-svc
-                  topologyKey: kubernetes.io/hostname
+                  topologyKey: topology.kubernetes.io/zone
           nodeSelector:
             dedicated: storage
           tolerations: