[occm] Set node selector and tolerations by default in OCCM helm chart (

#2346) * Set node selector and tolerations by default in OCCM helm chart This defines suitable default values for `nodeSelector` and `tolerations` to ensure a nicer out-of-the-box experience for users. Without this change all users would have to maintain these in their respective values file. See: - https://kubernetes.io/docs/reference/labels-annotations-taints/ Signed-off-by: Wolodja Wentland <[email protected]> * Fix grammar and typos in OCCM helm values Signed-off-by: Wolodja Wentland <[email protected]> --------- Signed-off-by: Wolodja Wentland <[email protected]>
kubernetes · Aug 31, 2023 · f331e13 · f331e13
1 parent 897bf41
commit f331e13
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 18 deletions.
diff --git a/charts/openstack-cloud-controller-manager/Chart.yaml b/charts/openstack-cloud-controller-manager/Chart.yaml
@@ -4,7 +4,7 @@ description: Openstack Cloud Controller Manager Helm Chart
 icon: https://object-storage-ca-ymq-1.vexxhost.net/swift/v1/6e4619c416ff4bd19e1c087f27a43eea/www-images-prod/openstack-logo/OpenStack-Logo-Vertical.png
 home: https://github.com/kubernetes/cloud-provider-openstack
 name: openstack-cloud-controller-manager
-version: 2.29.0-alpha.1
+version: 2.29.0-alpha.2
 maintainers:
   - name: eumel8
     email: [email protected]

diff --git a/charts/openstack-cloud-controller-manager/values.yaml b/charts/openstack-cloud-controller-manager/values.yaml
@@ -36,23 +36,18 @@ livenessProbe: {}
 # Set readinessProbe in the same way like livenessProbe
 readinessProbe: {}
 
-# Set nodeSelector where the controller shut run, i.e. controlplane nodes
-nodeSelector: {}
-# nodeSelector:
-#   node-role.kubernetes.io/controlplane: "true"
-
-# Set tolerations for nodes where the controller should run, i.e. node should uninitialized, controlplane...
-tolerations: []
-# tolerations:
-#   - key: node.cloudprovider.kubernetes.io/uninitialized
-#     value: "true"
-#     effect: NoSchedule
-#   - key: node-role.kubernetes.io/controlplane
-#     value: "true"
-#     effect: NoSchedule
-#   - key: node-role.kubernetes.io/etcd
-#     value: "true"
-#     effect: NoExecute
+# Set nodeSelector where the controller should run, i.e. controlplane nodes
+nodeSelector:
+  node-role.kubernetes.io/control-plane: ""
+
+# Set tolerations for nodes where the controller should run, i.e. node
+# should be uninitialized, controlplane...
+tolerations:
+  - key: node.cloudprovider.kubernetes.io/uninitialized
+    value: "true"
+    effect: NoSchedule
+  - key: node-role.kubernetes.io/control-plane
+    effect: NoSchedule
 
 # Set security settings for the controller pods
 # For all available options, see https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#podsecuritycontext-v1-core