refactor: tolerations

cluster/apps/monitoring/kube-prometheus-stack/helm-release.yaml

@@ -248,7 +248,7 @@ spec:
             scrape_interval: 60s
             metrics_path: "/metrics"
             static_configs:
-              - targets: ["opnsense.${SECRET_CLUSTER_DOMAIN_ROOT}:9273"]
+              - targets: ["opnsense.${SECRET_CLUSTER_DOMAIN_ROOT}.:9273"]
                 labels:
                   app: "opnsense"
           - job_name: "hass"

cluster/apps/system-upgrade/server-plan.yaml

@@ -26,12 +26,9 @@ spec:
           - "amd64"
   serviceAccountName: system-upgrade
   tolerations:
-    - key: "node-role.kubernetes.io/master"
+    - key: "node-role.kubernetes.io/control-plane"
       operator: "Exists"
-    - effect: NoExecute
+      effect: "NoSchedule"
-      operator: Exists
-    - effect: NoSchedule
-      operator: Exists
   upgrade:
     image: rancher/k3s-upgrade
   channel: https://update.k3s.io/v1-release/channels/v1.21

cluster/apps/system-upgrade/worker-plan.yaml

@@ -25,7 +25,7 @@ spec:
         operator: Exists
       - key: k3os.io/mode
         operator: DoesNotExist
-      - key: node-role.kubernetes.io/master
+      - key: node-role.kubernetes.io/control-plane
         operator: NotIn
         values:
           - "true"

cluster/core/kube-system/kured/helm-release.yaml

@@ -25,7 +25,8 @@ spec:
       endTime: "5:00"
       timeZone: "Europe/Paris"
     tolerations:
-      - key: "node-role.kubernetes.io/master"
+      - key: "node-role.kubernetes.io/control-plane"
         operator: "Exists"
+        effect: "NoSchedule"
     metrics:
       create: true

cluster/core/kube-system/node-feature-discovery/helm-release.yaml

@@ -19,10 +19,9 @@ spec:
   values:
     master:
       tolerations:
-        - effect: NoExecute
+        - key: "node-role.kubernetes.io/control-plane"
-          operator: Exists
+          operator: "Exists"
-        - effect: NoSchedule
+          effect: "NoSchedule"
-          operator: Exists
       affinity:
         nodeAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
@@ -83,7 +82,6 @@ spec:
       annotations:
         configmap.reloader.stakater.com/reload: "nfd-worker-conf"
       tolerations:
-        - effect: "NoExecute"
+        - key: "node-role.kubernetes.io/control-plane"
-          operator: "Exists"
-        - effect: "NoSchedule"
           operator: "Exists"
+          effect: "NoSchedule"

cluster/core/rook-ceph/helm-release.yaml

@@ -21,12 +21,9 @@ spec:
     csi:
       kubeletDirPath: /var/lib/kubelet
       pluginTolerations:
-        - key: "node-role.kubernetes.io/master"
+        - key: "node-role.kubernetes.io/control-plane"
           operator: "Exists"
-        - effect: NoExecute
+          effect: "NoSchedule"
-          operator: Exists
-        - effect: NoSchedule
-          operator: Exists
     resources:
       requests:
         cpu: 100m

cluster/core/system-upgrade/deployment.yaml

@@ -53,7 +53,7 @@ spec:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
               - matchExpressions:
-                  - key: "node-role.kubernetes.io/master"
+                  - key: "node-role.kubernetes.io/control-plane"
                     operator: In
                     values:
                       - "true"
@@ -61,13 +61,9 @@ spec:
       tolerations:
         - key: "CriticalAddonsOnly"
           operator: "Exists"
-        - key: "node-role.kubernetes.io/master"
+        - key: "node-role.kubernetes.io/control-plane"
           operator: "Exists"
           effect: "NoSchedule"
-        - effect: NoExecute
-          operator: Exists
-        - effect: NoSchedule
-          operator: Exists
       containers:
         - name: system-upgrade-controller
           image: rancher/system-upgrade-controller:v0.7.3