Merge pull request #81 from huffmanca/schedule-on-master

Bug 1873175: Allow CSI Drivers to run on master nodes
openshift · Aug 29, 2020 · b678a3a · b678a3a
2 parents 74905d1 + 479ad51
commit b678a3a
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 8 deletions.
diff --git a/assets/csidriveroperators/aws-ebs/07_deployment.yaml b/assets/csidriveroperators/aws-ebs/07_deployment.yaml
@@ -46,6 +46,11 @@ spec:
             cpu: 10m
       priorityClassName: system-cluster-critical
       serviceAccountName: aws-ebs-csi-driver-operator
+      nodeSelector:
+        node-role.kubernetes.io/master: ""
       tolerations:
       - key: CriticalAddonsOnly
         operator: Exists
+      - key: node-role.kubernetes.io/master
+        operator: Exists
+        effect: "NoSchedule"
diff --git a/assets/csidriveroperators/manila/07_deployment.yaml b/assets/csidriveroperators/manila/07_deployment.yaml
@@ -54,9 +54,14 @@ spec:
             cpu: 10m
       priorityClassName: system-cluster-critical
       serviceAccountName: manila-csi-driver-operator
+      nodeSelector:
+        node-role.kubernetes.io/master: ""
       tolerations:
       - key: CriticalAddonsOnly
         operator: Exists
+      - key: node-role.kubernetes.io/master
+        operator: Exists
+        effect: "NoSchedule"
       volumes:
       - name: cacert
         # Extract ca-bundle.pem to /usr/share/pki/ca-trust-source if present.

diff --git a/assets/csidriveroperators/ovirt/07_deployment.yaml b/assets/csidriveroperators/ovirt/07_deployment.yaml
@@ -16,6 +16,14 @@ spec:
     spec:
       serviceAccountName: ovirt-csi-driver-operator
       priorityClassName: system-cluster-critical
+      nodeSelector:
+        node-role.kubernetes.io/master: ""
+      tolerations:
+      - key: CriticalAddonsOnly
+        operator: Exists
+      - key: node-role.kubernetes.io/master
+        operator: Exists
+        effect: "NoSchedule"
       initContainers:
         - name: prepare-ovirt-config
           env:
@@ -68,7 +76,6 @@ spec:
           volumeMounts:
             - name: config
               mountPath: /tmp/config
-
       containers:
         - name: ovirt-csi-driver-operator
           image: ${OPERATOR_IMAGE}
@@ -77,9 +84,6 @@ spec:
             requests:
               memory: 50Mi
               cpu: 10m
-          tolerations:
-            - key: CriticalAddonsOnly
-              operator: Exists
           args:
             - start
             - "--node=$(KUBE_NODE_NAME)"

diff --git a/pkg/generated/bindata.go b/pkg/generated/bindata.go