Merge pull request #773 from vponomaryov/fix-helm-pod-anti-affinity

Fix default anti-affinity rules for scylla-operator
scylladb · Sep 7, 2021 · 71f335a · 71f335a
2 parents b24c6ae + 806d209
commit 71f335a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/deploy/operator/50_operator.deployment.yaml b/deploy/operator/50_operator.deployment.yaml
@@ -42,7 +42,7 @@ spec:
           - podAffinityTerm:
               labelSelector:
                 matchLabels:
-                  app.kubernetes.io/instance: webhook-server
-                  app.kubernetes.io/name: webhook-server
+                  app.kubernetes.io/instance: scylla-operator
+                  app.kubernetes.io/name: scylla-operator
               topologyKey: kubernetes.io/hostname
             weight: 1
diff --git a/deploy/operator/50_webhookserver.deployment.yaml b/deploy/operator/50_webhookserver.deployment.yaml
@@ -66,7 +66,7 @@ spec:
           - podAffinityTerm:
               labelSelector:
                 matchLabels:
-                  app.kubernetes.io/instance: scylla-operator
-                  app.kubernetes.io/name: scylla-operator
+                  app.kubernetes.io/instance: webhook-server
+                  app.kubernetes.io/name: webhook-server
               topologyKey: kubernetes.io/hostname
             weight: 1
diff --git a/examples/common/operator.yaml b/examples/common/operator.yaml
@@ -3785,8 +3785,8 @@ spec:
           - podAffinityTerm:
               labelSelector:
                 matchLabels:
-                  app.kubernetes.io/instance: webhook-server
-                  app.kubernetes.io/name: webhook-server
+                  app.kubernetes.io/instance: scylla-operator
+                  app.kubernetes.io/name: scylla-operator
               topologyKey: kubernetes.io/hostname
             weight: 1
 
@@ -3859,8 +3859,8 @@ spec:
           - podAffinityTerm:
               labelSelector:
                 matchLabels:
-                  app.kubernetes.io/instance: scylla-operator
-                  app.kubernetes.io/name: scylla-operator
+                  app.kubernetes.io/instance: webhook-server
+                  app.kubernetes.io/name: webhook-server
               topologyKey: kubernetes.io/hostname
             weight: 1
 

diff --git a/helm/scylla-operator/values.yaml b/helm/scylla-operator/values.yaml
@@ -31,8 +31,8 @@ affinity:
       podAffinityTerm:
         labelSelector:
           matchLabels:
-            app.kubernetes.io/name: webhook-server
-            app.kubernetes.io/instance: webhook-server
+            app.kubernetes.io/name: scylla-operator
+            app.kubernetes.io/instance: scylla-operator
         topologyKey: kubernetes.io/hostname
 
 webhook:
@@ -72,6 +72,6 @@ webhookServerAffinity:
       podAffinityTerm:
         labelSelector:
           matchLabels:
-            app.kubernetes.io/name: scylla-operator
-            app.kubernetes.io/instance: scylla-operator
+            app.kubernetes.io/name: webhook-server
+            app.kubernetes.io/instance: webhook-server
         topologyKey: kubernetes.io/hostname