UPSTREAM: <carry>: add nodeSelector and tolerations to operator-controller deployment via kustomize patch

Signed-off-by: everettraven <[email protected]>

Author: everettraven

openshift/kustomize/overlays/openshift/olmv1-ns/kustomization.yaml

@@ -23,4 +23,8 @@ patches:
       kind: Deployment
       name: controller-manager
     path: patches/manager_deployment_log_verbosity.yaml
+  - target:
+      kind: Deployment
+      name: controller-manager
+    path: patches/manager_deployment_node_selection.yaml
   - path: patches/manager_namespace_privileged.yaml

openshift/kustomize/overlays/openshift/olmv1-ns/patches/manager_deployment_node_selection.yaml

@@ -0,0 +1,25 @@
+- op: add
+  path: /spec/template/spec/nodeSelector
+  value: { "kubernetes.io/os": "linux", "node-role.kubernetes.io/master": "" }
+- op: add
+  path: /spec/template/spec/tolerations
+  value:
+    [
+      {
+        "effect": "NoSchedule",
+        "key": "node-role.kubernetes.io/master",
+        "operator": "Exists",
+      },
+      {
+        "effect": "NoExecute",
+        "key": "node.kubernetes.io/unreachable",
+        "operator": "Exists",
+        "tolerationSeconds": 120,
+      },
+      {
+        "effect": "NoExecute",
+        "key": "node.kubernetes.io/not-ready",
+        "operator": "Exists",
+        "tolerationSeconds": 120,
+      },
+    ]

openshift/manifests/19-deployment-openshift-operator-controller-operator-controller-controller-manager.yml

@@ -79,12 +79,27 @@ spec:
             - mountPath: /etc/containers
               name: etc-containers
               readOnly: true
+      nodeSelector:
+        kubernetes.io/os: linux
+        node-role.kubernetes.io/master: ""
       securityContext:
         runAsNonRoot: true
         seccompProfile:
           type: RuntimeDefault
       serviceAccountName: operator-controller-controller-manager
       terminationGracePeriodSeconds: 10
+      tolerations:
+        - effect: NoSchedule
+          key: node-role.kubernetes.io/master
+          operator: Exists
+        - effect: NoExecute
+          key: node.kubernetes.io/unreachable
+          operator: Exists
+          tolerationSeconds: 120
+        - effect: NoExecute
+          key: node.kubernetes.io/not-ready
+          operator: Exists
+          tolerationSeconds: 120
       volumes:
         - emptyDir: {}
           name: cache