Merge pull request openshift#12 from deads2k/toleration

tolerate any taint
stlaz · Oct 2, 2018 · 9722a8d · 9722a8d
2 parents 1dacc2a + affc692
commit 9722a8d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/bindata/v3.11.0/openshift-controller-manager/ds.yaml b/bindata/v3.11.0/openshift-controller-manager/ds.yaml
@@ -49,3 +49,5 @@ spec:
           secretName: serving-cert
       nodeSelector:
         node-role.kubernetes.io/master: ""
+      tolerations:
+      - operator: Exists
diff --git a/manifests/0000_21_cluster-openshift-controller-manager-operator_06_deployment.yaml b/manifests/0000_21_cluster-openshift-controller-manager-operator_06_deployment.yaml
@@ -40,3 +40,5 @@ spec:
           name: openshift-cluster-openshift-controller-manager-operator-config
       nodeSelector:
         node-role.kubernetes.io/master: ""
+      tolerations:
+      - operator: Exists
diff --git a/pkg/operator/v311_00_assets/bindata.go b/pkg/operator/v311_00_assets/bindata.go