Merge pull request #1302 from mesosphere/hectorj2f/node_selector_tole…

…rations chore: set the tolerations and nodeSelector
kubernetes-retired · Oct 20, 2020 · 59e60d9 · 59e60d9
2 parents 5787ab8 + 71821a6
commit 59e60d9
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/charts/kubefed/README.md b/charts/kubefed/README.md
@@ -103,6 +103,8 @@ chart and their default values.
 | controllermanager.image               | Name of the KubeFed image.                                                                                                                                                                  | kubefed                         |
 | controllermanager.tag                 | Tag of the KubeFed image.                                                                                                                                                                   | latest                          |
 | controllermanager.imagePullPolicy     | Image pull policy.                                                                                                                                                                          | IfNotPresent                    |
+| controllermanager.commonTolerations     | Tolerations for all the pods.                                                                                                                                                           |         []            |
+| controllermanager.commonNodeSelector     | Node selector for all the pods.                                                                                                                                                                |         {}            |
 | controllermanager.featureGates.PushReconciler               | Push reconciler feature.                                                                                                                                              | true                            |
 | controllermanager.featureGates.SchedulerPreferences         | Scheduler preferences feature.                                                                                                                                        | true                            |
 | controllermanager.featureGates.CrossClusterServiceDiscovery | Cross cluster service discovery feature.                                                                                                                              | false                            |

diff --git a/charts/kubefed/charts/controllermanager/templates/deployments.yaml b/charts/kubefed/charts/controllermanager/templates/deployments.yaml
@@ -24,6 +24,10 @@ spec:
         rollme: {{ randAlphaNum 5 | quote }}
       {{- end }}
     spec:
+      nodeSelector:
+        {{- toYaml .Values.commonNodeSelector | nindent 8 }}
+      tolerations:
+        {{- toYaml .Values.commonTolerations | nindent 8 }}
       securityContext:
         runAsUser: 1001
       serviceAccountName: kubefed-controller
@@ -82,6 +86,10 @@ spec:
         rollme: {{ randAlphaNum 5 | quote }}
       {{- end }}
     spec:
+      nodeSelector:
+        {{- toYaml .Values.commonNodeSelector | nindent 8 }}
+      tolerations:
+        {{- toYaml .Values.commonTolerations | nindent 8 }}
       securityContext:
         runAsUser: 1001
       serviceAccountName: kubefed-admission-webhook

diff --git a/charts/kubefed/values.yaml b/charts/kubefed/values.yaml
@@ -25,7 +25,19 @@ controllermanager:
     SchedulerPreferences:
     CrossClusterServiceDiscovery:
     FederatedIngress:
-
+
+  ## common node selector
+  commonNodeSelector: {}
+  #  key1: value1
+  #  key2: value2
+
+  ## common tolerations
+  commonTolerations: []
+  # - key: "key"
+  #   operator: "Equal"
+  #   value: "value"
+  #   effect: "NoSchedule"
+
   controller:
     annotations: {}
     replicaCount: 2