Update tasks.sh #3961
Update tasks.sh #3961
Conversation
Changed from master to control-plane, as master is deprecated per https://kubernetes.io/docs/reference/labels-annotations-taints/#node-role-kubernetes-io-master-taint.
There was a problem hiding this comment.
These files will need to be updated as well
https://github.com/replicatedhq/kURL/blob/main/addons/rook/template/base/operator/patches/deployment-tolerations.yaml
https://github.com/replicatedhq/kURL/blob/main/addons/rook/[all rook versions]/operator/patches/deployment-tolerations.yaml
| operator: Exists | ||
| containers: | ||
| - name: rook-ceph-operator | ||
| env: | ||
| - name: DISCOVER_TOLERATION_KEY | ||
| value: node-role.kubernetes.io/master | ||
| value: node-role.kubernetes.io/control-plane |
There was a problem hiding this comment.
this may need to be updated to DISCOVER_TOLERATIONS for newer rook versions
| @@ -490,32 +490,32 @@ spec: | |||
| template: | |||
| spec: | |||
| tolerations: | |||
| - key: node-role.kubernetes.io/master | |||
| - key: node-role.kubernetes.io/control-plane | |||
There was a problem hiding this comment.
Rather than remove the existing node-role.kubernetes.io/master toleration can we append node-role.kubernetes.io/control-plane as an additional toleration?
| - name: CSI_PROVISIONER_TOLERATIONS | ||
| value: | | ||
| - key: node-role.kubernetes.io/master | ||
| - key: node-role.kubernetes.io/control-plane |
There was a problem hiding this comment.
Rather than remove the existing node-role.kubernetes.io/master toleration can we append node-role.kubernetes.io/control-plane as an additional toleration?
| operator: Exists | ||
| - name: CSI_PLUGIN_TOLERATIONS | ||
| value: | | ||
| - key: node-role.kubernetes.io/master | ||
| - key: node-role.kubernetes.io/control-plane |
There was a problem hiding this comment.
Rather than remove the existing node-role.kubernetes.io/master toleration can we append node-role.kubernetes.io/control-plane as an additional toleration?
| operator: Exists | ||
| EOF | ||
| fi | ||
|
|
||
| # EKCO tolerations | ||
| if kubernetes_resource_exists kurl deployment ekc-operator; then | ||
| kubectl -n kurl patch deployment ekc-operator --type=merge -p '{"spec":{"template":{"spec":{"tolerations":[{"key":"node-role.kubernetes.io/master","operator":"Exists"}]}}}}' | ||
| kubectl -n kurl patch deployment ekc-operator --type=merge -p '{"spec":{"template":{"spec":{"tolerations":[{"key":"node-role.kubernetes.io/control-plane","operator":"Exists"}]}}}}' |
There was a problem hiding this comment.
Rather than remove the existing node-role.kubernetes.io/master toleration can we append node-role.kubernetes.io/control-plane as an additional toleration?
| @@ -479,7 +479,7 @@ function taint_primaries() { | |||
|
|
|||
| # Rook tolerations | |||
| if kubectl get namespace rook-ceph &>/dev/null; then | |||
| kubectl -n rook-ceph patch cephclusters rook-ceph --type=merge -p '{"spec":{"placement":{"all":{"tolerations":[{"key":"node-role.kubernetes.io/master","operator":"Exists"}]}}}}' | |||
| kubectl -n rook-ceph patch cephclusters rook-ceph --type=merge -p '{"spec":{"placement":{"all":{"tolerations":[{"key":"node-role.kubernetes.io/control-plane","operator":"Exists"}]}}}}' | |||
There was a problem hiding this comment.
Rather than remove the existing node-role.kubernetes.io/master toleration can we append node-role.kubernetes.io/control-plane as an additional toleration?
| fi | ||
|
|
||
|
|
||
| # Taint all primaries | ||
| kubectl taint nodes --overwrite --selector=node-role.kubernetes.io/master node-role.kubernetes.io/master=:NoSchedule | ||
| kubectl taint nodes --overwrite --selector=node-role.kubernetes.io/control-plane node-role.kubernetes.io/control-plane=:NoSchedule |
There was a problem hiding this comment.
Would it be possible to detect the kubernetes version and apply the proper taint for that version?
Changed from master to control-plane, as master is deprecated per https://kubernetes.io/docs/reference/labels-annotations-taints/#node-role-kubernetes-io-master-taint.
What this PR does / why we need it:
Changes the taints from master to control-plane as that is the new verbiage.
Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
Steps to reproduce
Does this PR introduce a user-facing change?
Does this PR require documentation?