Fix antiAffinity selectors

Signed-off-by: jannfis <jann@mistrust.net>
argoproj · Mar 7, 2021 · c057683 · c057683
1 parent 77ec171
commit c057683
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/manifests/ha/base/redis-ha/overlays/deployment-labels.yaml b/manifests/ha/base/redis-ha/overlays/deployment-labels.yaml
@@ -4,5 +4,9 @@
     app.kubernetes.io/name: argocd-redis-ha-haproxy
 - op: replace
   path: /spec/template/metadata/labels
+  value:
+    app.kubernetes.io/name: argocd-redis-ha-haproxy
+- op: replace
+  path: /spec/template/spec/affinity/podAntiAffinity/requiredDuringSchedulingIgnoredDuringExecution/0/labelSelector/matchLabels
   value:
     app.kubernetes.io/name: argocd-redis-ha-haproxy
diff --git a/manifests/ha/base/redis-ha/overlays/statefulset-labels.yaml b/manifests/ha/base/redis-ha/overlays/statefulset-labels.yaml
@@ -5,4 +5,8 @@
 - op: replace
   path: /spec/template/metadata/labels
   value:
-    app.kubernetes.io/name: argocd-redis-ha
+    app.kubernetes.io/name: argocd-redis-ha
+- op: replace
+  path: /spec/template/spec/affinity/podAntiAffinity/requiredDuringSchedulingIgnoredDuringExecution/0/labelSelector/matchLabels
+  value:
+    app.kubernetes.io/name: argocd-redis-ha
diff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml
@@ -3216,9 +3216,7 @@ spec:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchLabels:
-                app: redis-ha-haproxy
-                release: argocd
-                revision: "1"
+                app.kubernetes.io/name: argocd-redis-ha-haproxy
             topologyKey: kubernetes.io/hostname
       containers:
       - image: haproxy:2.0.20-alpine
@@ -3519,9 +3517,7 @@ spec:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchLabels:
-                app: redis-ha
-                argocd-redis-ha: replica
-                release: argocd
+                app.kubernetes.io/name: argocd-redis-ha
             topologyKey: kubernetes.io/hostname
       automountServiceAccountToken: false
       containers:

diff --git a/manifests/ha/namespace-install.yaml b/manifests/ha/namespace-install.yaml
@@ -3131,9 +3131,7 @@ spec:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchLabels:
-                app: redis-ha-haproxy
-                release: argocd
-                revision: "1"
+                app.kubernetes.io/name: argocd-redis-ha-haproxy
             topologyKey: kubernetes.io/hostname
       containers:
       - image: haproxy:2.0.20-alpine
@@ -3434,9 +3432,7 @@ spec:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchLabels:
-                app: redis-ha
-                argocd-redis-ha: replica
-                release: argocd
+                app.kubernetes.io/name: argocd-redis-ha
             topologyKey: kubernetes.io/hostname
       automountServiceAccountToken: false
       containers: