Merge pull request #709 from tmshort/ocpbugs-62517-ha-replicas

OCPBUGS-62517: Set replicas=1, PDB, and pod anti-affinity for HA topology

Author: openshift-merge-bot[bot]

openshift/catalogd/manifests-experimental.yaml

@@ -957,6 +957,14 @@ spec:
                     operator: In
                     values:
                       - linux
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - podAffinityTerm:
+                labelSelector:
+                  matchLabels:
+                    control-plane: catalogd-controller-manager
+                topologyKey: kubernetes.io/hostname
+              weight: 100
       nodeSelector:
         kubernetes.io/os: linux
         node-role.kubernetes.io/control-plane: ""

openshift/catalogd/manifests.yaml

@@ -956,6 +956,14 @@ spec:
                     operator: In
                     values:
                       - linux
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - podAffinityTerm:
+                labelSelector:
+                  matchLabels:
+                    control-plane: catalogd-controller-manager
+                topologyKey: kubernetes.io/hostname
+              weight: 100
       nodeSelector:
         kubernetes.io/os: linux
         node-role.kubernetes.io/control-plane: ""

openshift/helm/catalogd.yaml

@@ -8,6 +8,7 @@ options:
     enabled: true
     deployment:
       image: ${CATALOGD_IMAGE}
+      replicas: 1
     podDisruptionBudget:
       enabled: false
   operatorController:
@@ -25,6 +26,15 @@ namespaces:
 # Deployment values for catalogd
 deployments:
   templateSpec:
+    affinity:
+      podAntiAffinity:
+        preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            podAffinityTerm:
+              topologyKey: kubernetes.io/hostname
+              labelSelector:
+                matchLabels:
+                  control-plane: catalogd-controller-manager
     priorityClassName: system-cluster-critical
     securityContext:
       seLinuxOptions:

openshift/helm/operator-controller.yaml

@@ -8,6 +8,7 @@ options:
     enabled: true
     deployment:
       image: ${OPERATOR_CONTROLLER_IMAGE}
+      replicas: 1
     podDisruptionBudget:
       enabled: false
   catalogd:
@@ -26,6 +27,15 @@ namespaces:
 # Deployment values for operator-controller
 deployments:
   templateSpec:
+    affinity:
+      podAntiAffinity:
+        preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            podAffinityTerm:
+              topologyKey: kubernetes.io/hostname
+              labelSelector:
+                matchLabels:
+                  control-plane: operator-controller-controller-manager
     priorityClassName: system-cluster-critical
     securityContext:
       seLinuxOptions:

openshift/operator-controller/manifests-experimental.yaml

@@ -1345,6 +1345,14 @@ spec:
                     operator: In
                     values:
                       - linux
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - podAffinityTerm:
+                labelSelector:
+                  matchLabels:
+                    control-plane: operator-controller-controller-manager
+                topologyKey: kubernetes.io/hostname
+              weight: 100
       nodeSelector:
         kubernetes.io/os: linux
         node-role.kubernetes.io/control-plane: ""

openshift/operator-controller/manifests.yaml

@@ -1188,6 +1188,14 @@ spec:
                     operator: In
                     values:
                       - linux
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - podAffinityTerm:
+                labelSelector:
+                  matchLabels:
+                    control-plane: operator-controller-controller-manager
+                topologyKey: kubernetes.io/hostname
+              weight: 100
       nodeSelector:
         kubernetes.io/os: linux
         node-role.kubernetes.io/control-plane: ""