Skip to content

Commit

Permalink
Set node selector and tolerations by default in OCCM helm chart
Browse files Browse the repository at this point in the history
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 <w@wentland.dev>
  • Loading branch information
wwentland committed Aug 29, 2023
1 parent bc3ffab commit 1893df2
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 15 deletions.
2 changes: 1 addition & 1 deletion charts/openstack-cloud-controller-manager/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.0
version: 2.29.0-alpha.1
maintainers:
- name: eumel8
email: f.kloeker@telekom.de
Expand Down
22 changes: 8 additions & 14 deletions charts/openstack-cloud-controller-manager/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,22 +37,16 @@ livenessProbe: {}
readinessProbe: {}

# Set nodeSelector where the controller shut run, i.e. controlplane nodes
nodeSelector: {}
# nodeSelector:
# node-role.kubernetes.io/controlplane: "true"
nodeSelector:
node-role.kubernetes.io/control-plane: ""

# 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
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
Expand Down

0 comments on commit 1893df2

Please sign in to comment.