fix: Remove deprecated toleration for node-role.kubernetes.io/master (#895)

jimmidyson · web-flow · commit 9b02457104d7 · 2024-09-04T11:48:27.000+02:00
This was removed in Kubernetes v1.24 so is no longer needed and actually throws a warning now if it is kept when applying manifests: ``` [KubeAPIWarningLogger] spec.template.spec.affinity.nodeAffinity.preferredDuringSchedulingIgnoredDuringExecution[1].preference.matchExpressions[0].key: node-role.kubernetes.io/master is use "node-role.kubernetes.io/control-plane" instead ``` Removal note in https://kubernetes.io/blog/2022/04/07/upcoming-changes-in-kubernetes-1-24/#api-removals-deprecations-and-other-changes-for-kubernetes-1-24. Blocked by #893.
diff --git a/charts/cluster-api-runtime-extensions-nutanix/README.md b/charts/cluster-api-runtime-extensions-nutanix/README.md
@@ -100,4 +100,4 @@ A Helm chart for cluster-api-runtime-extensions-nutanix
 | service.annotations | object | `{}` |  |
 | service.port | int | `443` |  |
 | service.type | string | `"ClusterIP"` |  |
-| tolerations | list | `[{"effect":"NoSchedule","key":"node-role.kubernetes.io/master","operator":"Equal"},{"effect":"NoSchedule","key":"node-role.kubernetes.io/control-plane","operator":"Equal"}]` | Kubernetes pod tolerations |
+| tolerations | list | `[{"effect":"NoSchedule","key":"node-role.kubernetes.io/control-plane","operator":"Equal"}]` | Kubernetes pod tolerations |
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.27.9-configmap.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.27.9-configmap.yaml
@@ -177,8 +177,6 @@ data:
           - effect: NoSchedule
             key: node.cloudprovider.kubernetes.io/uninitialized
             value: "true"
-          - effect: NoSchedule
-            key: node-role.kubernetes.io/master
           - effect: NoSchedule
             key: node-role.kubernetes.io/control-plane
       updateStrategy:
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.28.9-configmap.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.28.9-configmap.yaml
@@ -177,8 +177,6 @@ data:
           - effect: NoSchedule
             key: node.cloudprovider.kubernetes.io/uninitialized
             value: "true"
-          - effect: NoSchedule
-            key: node-role.kubernetes.io/master
           - effect: NoSchedule
             key: node-role.kubernetes.io/control-plane
       updateStrategy:
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.29.6-configmap.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.29.6-configmap.yaml
@@ -177,8 +177,6 @@ data:
           - effect: NoSchedule
             key: node.cloudprovider.kubernetes.io/uninitialized
             value: "true"
-          - effect: NoSchedule
-            key: node-role.kubernetes.io/master
           - effect: NoSchedule
             key: node-role.kubernetes.io/control-plane
       updateStrategy:
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.30.2-configmap.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.30.2-configmap.yaml
@@ -177,8 +177,6 @@ data:
           - effect: NoSchedule
             key: node.cloudprovider.kubernetes.io/uninitialized
             value: "true"
-          - effect: NoSchedule
-            key: node-role.kubernetes.io/master
           - effect: NoSchedule
             key: node-role.kubernetes.io/control-plane
       updateStrategy:
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.31.0-configmap.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.31.0-configmap.yaml
@@ -177,8 +177,6 @@ data:
           - effect: NoSchedule
             key: node.cloudprovider.kubernetes.io/uninitialized
             value: "true"
-          - effect: NoSchedule
-            key: node-role.kubernetes.io/master
           - effect: NoSchedule
             key: node-role.kubernetes.io/control-plane
       updateStrategy:
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/helm-addon-installation.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/helm-addon-installation.yaml
@@ -31,4 +31,13 @@ data:
     {{ "{{" }}$ccmVersion := get $k8sMinorVersionToCCMVersion ( print $clusterSemver.Major "." $clusterSemver.Minor ) {{ "}}" }}
     image:
       tag: {{ "{{ " }} $ccmVersion {{ "}}" }}
+
+    tolerations:
+    - key: node.cloudprovider.kubernetes.io/uninitialized
+      value: "true"
+      effect: NoSchedule
+    - key: node-role.kubernetes.io/control-plane
+      effect: NoSchedule
+
+
 {{- end -}}
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/csi/aws-ebs/manifests/aws-ebs-csi-configmap.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/csi/aws-ebs/manifests/aws-ebs-csi-configmap.yaml
@@ -786,9 +786,6 @@ data:
           - effect: NoExecute
             operator: Exists
             tolerationSeconds: 300
-          - effect: NoSchedule
-            key: node-role.kubernetes.io/master
-            operator: Exists
           - effect: NoSchedule
             key: node-role.kubernetes.io/control-plane
             operator: Exists
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/csi/aws-ebs/manifests/helm-addon-installation.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/csi/aws-ebs/manifests/helm-addon-installation.yaml
@@ -22,9 +22,6 @@ data:
         - effect: NoExecute
           operator: Exists
           tolerationSeconds: 300
-        - effect: NoSchedule
-          key: node-role.kubernetes.io/master
-          operator: Exists
         - effect: NoSchedule
           key: node-role.kubernetes.io/control-plane
           operator: Exists
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/csi/local-path/manifests/helm-addon-installation.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/csi/local-path/manifests/helm-addon-installation.yaml
@@ -19,9 +19,6 @@ data:
       - effect: NoExecute
         operator: Exists
         tolerationSeconds: 300
-      - effect: NoSchedule
-        key: node-role.kubernetes.io/master
-        operator: Exists
       - effect: NoSchedule
         key: node-role.kubernetes.io/control-plane
         operator: Exists
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/csi/local-path/manifests/local-path-provisioner-csi-configmap.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/csi/local-path/manifests/local-path-provisioner-csi-configmap.yaml
@@ -248,9 +248,6 @@ data:
           - effect: NoExecute
             operator: Exists
             tolerationSeconds: 300
-          - effect: NoSchedule
-            key: node-role.kubernetes.io/master
-            operator: Exists
           - effect: NoSchedule
             key: node-role.kubernetes.io/control-plane
             operator: Exists
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/csi/nutanix/manifests/helm-addon-installation.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/csi/nutanix/manifests/helm-addon-installation.yaml
@@ -20,9 +20,6 @@ data:
       - effect: NoExecute
         operator: Exists
         tolerationSeconds: 300
-      - effect: NoSchedule
-        key: node-role.kubernetes.io/master
-        operator: Exists
       - effect: NoSchedule
         key: node-role.kubernetes.io/control-plane
         operator: Exists
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/csi/snapshot-controller/manifests/helm-addon-installation.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/csi/snapshot-controller/manifests/helm-addon-installation.yaml
@@ -16,9 +16,6 @@ data:
         - effect: NoExecute
           operator: Exists
           tolerationSeconds: 300
-        - effect: NoSchedule
-          key: node-role.kubernetes.io/master
-          operator: Exists
         - effect: NoSchedule
           key: node-role.kubernetes.io/control-plane
           operator: Exists
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/nfd/manifests/helm-addon-installation.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/nfd/manifests/helm-addon-installation.yaml
@@ -22,16 +22,12 @@ data:
               - "class"
               - "vendor"
       tolerations:
-        - effect: NoSchedule
-          key: node-role.kubernetes.io/master
         - effect: NoSchedule
           key: node-role.kubernetes.io/control-plane
     ### <NFD-WORKER-CONF-END-DO-NOT-REMOVE>
 
     gc:
       tolerations:
-        - effect: NoSchedule
-          key: node-role.kubernetes.io/master
         - effect: NoSchedule
           key: node-role.kubernetes.io/control-plane
 {{- end -}}
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/nfd/manifests/node-feature-discovery-configmap.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/nfd/manifests/node-feature-discovery-configmap.yaml
@@ -1079,8 +1079,6 @@ data:
           securityContext: {}
           serviceAccountName: node-feature-discovery-worker
           tolerations:
-          - effect: NoSchedule
-            key: node-role.kubernetes.io/master
           - effect: NoSchedule
             key: node-role.kubernetes.io/control-plane
           volumes:
@@ -1145,13 +1143,6 @@ data:
           affinity:
             nodeAffinity:
               preferredDuringSchedulingIgnoredDuringExecution:
-              - preference:
-                  matchExpressions:
-                  - key: node-role.kubernetes.io/master
-                    operator: In
-                    values:
-                    - ""
-                weight: 1
               - preference:
                   matchExpressions:
                   - key: node-role.kubernetes.io/control-plane
@@ -1287,8 +1278,6 @@ data:
           securityContext: {}
           serviceAccountName: node-feature-discovery-gc
           tolerations:
-          - effect: NoSchedule
-            key: node-role.kubernetes.io/master
           - effect: NoSchedule
             key: node-role.kubernetes.io/control-plane
 kind: ConfigMap
diff --git a/charts/cluster-api-runtime-extensions-nutanix/values.yaml b/charts/cluster-api-runtime-extensions-nutanix/values.yaml
@@ -170,9 +170,6 @@ nodeSelector: {}
 
 # -- Kubernetes pod tolerations
 tolerations:
-  - key: node-role.kubernetes.io/master
-    operator: Equal
-    effect: NoSchedule
   - key: node-role.kubernetes.io/control-plane
     operator: Equal
     effect: NoSchedule
diff --git a/hack/addons/kustomize/aws-ccm/helm-values.yaml b/hack/addons/kustomize/aws-ccm/helm-values.yaml
@@ -15,3 +15,10 @@ args:
   - --v=2
   - --cloud-provider=aws
   - --configure-cloud-routes=false
+
+tolerations:
+- key: node.cloudprovider.kubernetes.io/uninitialized
+  value: "true"
+  effect: NoSchedule
+- key: node-role.kubernetes.io/control-plane
+  effect: NoSchedule
diff --git a/hack/addons/kustomize/aws-ebs-csi/helm-values.yaml b/hack/addons/kustomize/aws-ebs-csi/helm-values.yaml
@@ -16,9 +16,6 @@ controller:
     - effect: NoExecute
       operator: Exists
       tolerationSeconds: 300
-    - effect: NoSchedule
-      key: node-role.kubernetes.io/master
-      operator: Exists
     - effect: NoSchedule
       key: node-role.kubernetes.io/control-plane
       operator: Exists
diff --git a/hack/addons/kustomize/local-path-provisioner-csi/helm-values.yaml b/hack/addons/kustomize/local-path-provisioner-csi/helm-values.yaml
@@ -13,9 +13,6 @@ tolerations:
   - effect: NoExecute
     operator: Exists
     tolerationSeconds: 300
-  - effect: NoSchedule
-    key: node-role.kubernetes.io/master
-    operator: Exists
   - effect: NoSchedule
     key: node-role.kubernetes.io/control-plane
     operator: Exists
diff --git a/hack/addons/kustomize/nfd/helm-values.yaml b/hack/addons/kustomize/nfd/helm-values.yaml
@@ -7,6 +7,15 @@ master:
     - nvidia.com
     - beta.amd.com
     - amd.com
+  affinity:
+    nodeAffinity:
+      preferredDuringSchedulingIgnoredDuringExecution:
+        - weight: 1
+          preference:
+            matchExpressions:
+              - key: "node-role.kubernetes.io/control-plane"
+                operator: In
+                values: [""]
 
 worker: ### <NFD-WORKER-CONF-START-DO-NOT-REMOVE>
   config:
@@ -16,15 +25,11 @@ worker: ### <NFD-WORKER-CONF-START-DO-NOT-REMOVE>
           - "class"
           - "vendor"
   tolerations:
-    - effect: NoSchedule
-      key: node-role.kubernetes.io/master
     - effect: NoSchedule
       key: node-role.kubernetes.io/control-plane
 ### <NFD-WORKER-CONF-END-DO-NOT-REMOVE>
 
 gc:
   tolerations:
-    - effect: NoSchedule
-      key: node-role.kubernetes.io/master
     - effect: NoSchedule
       key: node-role.kubernetes.io/control-plane
diff --git a/pkg/handlers/generic/lifecycle/ccm/aws/handler_test.go b/pkg/handlers/generic/lifecycle/ccm/aws/handler_test.go
@@ -69,8 +69,6 @@ spec:
       - effect: NoSchedule
         key: node.cloudprovider.kubernetes.io/uninitialized
         value: "true"
-      - effect: NoSchedule
-        key: node-role.kubernetes.io/master
       - effect: NoSchedule
         key: node-role.kubernetes.io/control-plane
   updateStrategy:
