✨ Bump e2e tests to kubernetes v1.31.0 (#3154)

* Bump e2e tests to kubernetes v1.31.0 * revert to CPI v1.31.0-rc.1 * fix flatcar image --------- Co-authored-by: Stefan Bueringer <[email protected]>
kubernetes-sigs · Aug 14, 2024 · 31ee7f1 · 31ee7f1
1 parent 4f8d638
commit 31ee7f1
Show file tree

Hide file tree

Showing 13 changed files with 185 additions and 224 deletions.
diff --git a/internal/test/helpers/vcsim/model.go b/internal/test/helpers/vcsim/model.go
@@ -38,6 +38,7 @@ var (
 		"ubuntu-2204-kube-v1.28.0",
 		"ubuntu-2204-kube-v1.29.0",
 		"ubuntu-2204-kube-v1.30.0",
+		"ubuntu-2204-kube-v1.31.0",
 	}
 )
 

diff --git a/packaging/flavorgen/cloudprovider/cpi/cpi.yaml b/packaging/flavorgen/cloudprovider/cpi/cpi.yaml
@@ -131,21 +131,25 @@ spec:
         vsphere-cpi-infra: daemonset
     spec:
       tolerations:
-      - key: node.cloudprovider.kubernetes.io/uninitialized
-        value: "true"
-        effect: NoSchedule
-      - key: node-role.kubernetes.io/master
-        effect: NoSchedule
-        operator: Exists
-      - key: node-role.kubernetes.io/control-plane
-        effect: NoSchedule
-        operator: Exists
-      - key: node.kubernetes.io/not-ready
-        effect: NoSchedule
-        operator: Exists
-      - key: CriticalAddonsOnly
-        effect: NoExecute
-        operator: Exists
+        - effect: NoSchedule
+          key: node.cloudprovider.kubernetes.io/uninitialized
+          value: "true"
+        - effect: NoSchedule
+          key: node-role.kubernetes.io/control-plane
+          operator: Exists
+        - effect: NoSchedule
+          key: node.kubernetes.io/not-ready
+          operator: Exists
+        - effect: NoExecute
+          key: CriticalAddonsOnly
+          operator: Exists
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+            - matchExpressions:
+              - key: node-role.kubernetes.io/control-plane
+                operator: Exists
       securityContext:
         fsGroup: 1001
         runAsUser: 1001
@@ -155,7 +159,7 @@ spec:
       priorityClassName: system-node-critical
       containers:
       - name: vsphere-cpi
-        image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:v1.30.0-rc.0
+        image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:v1.31.0
         imagePullPolicy: IfNotPresent
         args:
           - --cloud-provider=vsphere
@@ -169,16 +173,6 @@ spec:
         - name: vsphere-config-volume
           configMap:
             name: cloud-config
-      affinity:
-        nodeAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            nodeSelectorTerms:
-            - matchExpressions:
-              - key: node-role.kubernetes.io/control-plane
-                operator: Exists
-            - matchExpressions:
-              - key: node-role.kubernetes.io/master
-                operator: Exists
 ---
 # Source: vsphere-cpi/templates/role-binding.yaml
 apiVersion: v1

diff --git a/templates/cluster-template-external-loadbalancer.yaml b/templates/cluster-template-external-loadbalancer.yaml
@@ -1258,21 +1258,25 @@ data:
             vsphere-cpi-infra: daemonset
         spec:
           tolerations:
-          - key: node.cloudprovider.kubernetes.io/uninitialized
-            value: "true"
-            effect: NoSchedule
-          - key: node-role.kubernetes.io/master
-            effect: NoSchedule
-            operator: Exists
-          - key: node-role.kubernetes.io/control-plane
-            effect: NoSchedule
-            operator: Exists
-          - key: node.kubernetes.io/not-ready
-            effect: NoSchedule
-            operator: Exists
-          - key: CriticalAddonsOnly
-            effect: NoExecute
-            operator: Exists
+            - effect: NoSchedule
+              key: node.cloudprovider.kubernetes.io/uninitialized
+              value: "true"
+            - effect: NoSchedule
+              key: node-role.kubernetes.io/control-plane
+              operator: Exists
+            - effect: NoSchedule
+              key: node.kubernetes.io/not-ready
+              operator: Exists
+            - effect: NoExecute
+              key: CriticalAddonsOnly
+              operator: Exists
+          affinity:
+            nodeAffinity:
+              requiredDuringSchedulingIgnoredDuringExecution:
+                nodeSelectorTerms:
+                - matchExpressions:
+                  - key: node-role.kubernetes.io/control-plane
+                    operator: Exists
           securityContext:
             fsGroup: 1001
             runAsUser: 1001
@@ -1296,16 +1300,6 @@ data:
             - name: vsphere-config-volume
               configMap:
                 name: cloud-config
-          affinity:
-            nodeAffinity:
-              requiredDuringSchedulingIgnoredDuringExecution:
-                nodeSelectorTerms:
-                - matchExpressions:
-                  - key: node-role.kubernetes.io/control-plane
-                    operator: Exists
-                - matchExpressions:
-                  - key: node-role.kubernetes.io/master
-                    operator: Exists
     ---
     apiVersion: rbac.authorization.k8s.io/v1
     kind: RoleBinding

diff --git a/templates/cluster-template-ignition.yaml b/templates/cluster-template-ignition.yaml
@@ -1478,21 +1478,25 @@ data:
             vsphere-cpi-infra: daemonset
         spec:
           tolerations:
-          - key: node.cloudprovider.kubernetes.io/uninitialized
-            value: "true"
-            effect: NoSchedule
-          - key: node-role.kubernetes.io/master
-            effect: NoSchedule
-            operator: Exists
-          - key: node-role.kubernetes.io/control-plane
-            effect: NoSchedule
-            operator: Exists
-          - key: node.kubernetes.io/not-ready
-            effect: NoSchedule
-            operator: Exists
-          - key: CriticalAddonsOnly
-            effect: NoExecute
-            operator: Exists
+            - effect: NoSchedule
+              key: node.cloudprovider.kubernetes.io/uninitialized
+              value: "true"
+            - effect: NoSchedule
+              key: node-role.kubernetes.io/control-plane
+              operator: Exists
+            - effect: NoSchedule
+              key: node.kubernetes.io/not-ready
+              operator: Exists
+            - effect: NoExecute
+              key: CriticalAddonsOnly
+              operator: Exists
+          affinity:
+            nodeAffinity:
+              requiredDuringSchedulingIgnoredDuringExecution:
+                nodeSelectorTerms:
+                - matchExpressions:
+                  - key: node-role.kubernetes.io/control-plane
+                    operator: Exists
           securityContext:
             fsGroup: 1001
             runAsUser: 1001
@@ -1516,16 +1520,6 @@ data:
             - name: vsphere-config-volume
               configMap:
                 name: cloud-config
-          affinity:
-            nodeAffinity:
-              requiredDuringSchedulingIgnoredDuringExecution:
-                nodeSelectorTerms:
-                - matchExpressions:
-                  - key: node-role.kubernetes.io/control-plane
-                    operator: Exists
-                - matchExpressions:
-                  - key: node-role.kubernetes.io/master
-                    operator: Exists
     ---
     apiVersion: rbac.authorization.k8s.io/v1
     kind: RoleBinding

diff --git a/templates/cluster-template-node-ipam.yaml b/templates/cluster-template-node-ipam.yaml
@@ -1393,21 +1393,25 @@ data:
             vsphere-cpi-infra: daemonset
         spec:
           tolerations:
-          - key: node.cloudprovider.kubernetes.io/uninitialized
-            value: "true"
-            effect: NoSchedule
-          - key: node-role.kubernetes.io/master
-            effect: NoSchedule
-            operator: Exists
-          - key: node-role.kubernetes.io/control-plane
-            effect: NoSchedule
-            operator: Exists
-          - key: node.kubernetes.io/not-ready
-            effect: NoSchedule
-            operator: Exists
-          - key: CriticalAddonsOnly
-            effect: NoExecute
-            operator: Exists
+            - effect: NoSchedule
+              key: node.cloudprovider.kubernetes.io/uninitialized
+              value: "true"
+            - effect: NoSchedule
+              key: node-role.kubernetes.io/control-plane
+              operator: Exists
+            - effect: NoSchedule
+              key: node.kubernetes.io/not-ready
+              operator: Exists
+            - effect: NoExecute
+              key: CriticalAddonsOnly
+              operator: Exists
+          affinity:
+            nodeAffinity:
+              requiredDuringSchedulingIgnoredDuringExecution:
+                nodeSelectorTerms:
+                - matchExpressions:
+                  - key: node-role.kubernetes.io/control-plane
+                    operator: Exists
           securityContext:
             fsGroup: 1001
             runAsUser: 1001
@@ -1431,16 +1435,6 @@ data:
             - name: vsphere-config-volume
               configMap:
                 name: cloud-config
-          affinity:
-            nodeAffinity:
-              requiredDuringSchedulingIgnoredDuringExecution:
-                nodeSelectorTerms:
-                - matchExpressions:
-                  - key: node-role.kubernetes.io/control-plane
-                    operator: Exists
-                - matchExpressions:
-                  - key: node-role.kubernetes.io/master
-                    operator: Exists
     ---
     apiVersion: rbac.authorization.k8s.io/v1
     kind: RoleBinding

diff --git a/templates/cluster-template-supervisor.yaml b/templates/cluster-template-supervisor.yaml
@@ -1343,21 +1343,25 @@ data:
             vsphere-cpi-infra: daemonset
         spec:
           tolerations:
-          - key: node.cloudprovider.kubernetes.io/uninitialized
-            value: "true"
-            effect: NoSchedule
-          - key: node-role.kubernetes.io/master
-            effect: NoSchedule
-            operator: Exists
-          - key: node-role.kubernetes.io/control-plane
-            effect: NoSchedule
-            operator: Exists
-          - key: node.kubernetes.io/not-ready
-            effect: NoSchedule
-            operator: Exists
-          - key: CriticalAddonsOnly
-            effect: NoExecute
-            operator: Exists
+            - effect: NoSchedule
+              key: node.cloudprovider.kubernetes.io/uninitialized
+              value: "true"
+            - effect: NoSchedule
+              key: node-role.kubernetes.io/control-plane
+              operator: Exists
+            - effect: NoSchedule
+              key: node.kubernetes.io/not-ready
+              operator: Exists
+            - effect: NoExecute
+              key: CriticalAddonsOnly
+              operator: Exists
+          affinity:
+            nodeAffinity:
+              requiredDuringSchedulingIgnoredDuringExecution:
+                nodeSelectorTerms:
+                - matchExpressions:
+                  - key: node-role.kubernetes.io/control-plane
+                    operator: Exists
           securityContext:
             fsGroup: 1001
             runAsUser: 1001
@@ -1381,16 +1385,6 @@ data:
             - name: vsphere-config-volume
               configMap:
                 name: cloud-config
-          affinity:
-            nodeAffinity:
-              requiredDuringSchedulingIgnoredDuringExecution:
-                nodeSelectorTerms:
-                - matchExpressions:
-                  - key: node-role.kubernetes.io/control-plane
-                    operator: Exists
-                - matchExpressions:
-                  - key: node-role.kubernetes.io/master
-                    operator: Exists
     ---
     apiVersion: rbac.authorization.k8s.io/v1
     kind: RoleBinding

diff --git a/templates/cluster-template-topology-supervisor.yaml b/templates/cluster-template-topology-supervisor.yaml
@@ -1151,21 +1151,25 @@ data:
             vsphere-cpi-infra: daemonset
         spec:
           tolerations:
-          - key: node.cloudprovider.kubernetes.io/uninitialized
-            value: "true"
-            effect: NoSchedule
-          - key: node-role.kubernetes.io/master
-            effect: NoSchedule
-            operator: Exists
-          - key: node-role.kubernetes.io/control-plane
-            effect: NoSchedule
-            operator: Exists
-          - key: node.kubernetes.io/not-ready
-            effect: NoSchedule
-            operator: Exists
-          - key: CriticalAddonsOnly
-            effect: NoExecute
-            operator: Exists
+            - effect: NoSchedule
+              key: node.cloudprovider.kubernetes.io/uninitialized
+              value: "true"
+            - effect: NoSchedule
+              key: node-role.kubernetes.io/control-plane
+              operator: Exists
+            - effect: NoSchedule
+              key: node.kubernetes.io/not-ready
+              operator: Exists
+            - effect: NoExecute
+              key: CriticalAddonsOnly
+              operator: Exists
+          affinity:
+            nodeAffinity:
+              requiredDuringSchedulingIgnoredDuringExecution:
+                nodeSelectorTerms:
+                - matchExpressions:
+                  - key: node-role.kubernetes.io/control-plane
+                    operator: Exists
           securityContext:
             fsGroup: 1001
             runAsUser: 1001
@@ -1189,16 +1193,6 @@ data:
             - name: vsphere-config-volume
               configMap:
                 name: cloud-config
-          affinity:
-            nodeAffinity:
-              requiredDuringSchedulingIgnoredDuringExecution:
-                nodeSelectorTerms:
-                - matchExpressions:
-                  - key: node-role.kubernetes.io/control-plane
-                    operator: Exists
-                - matchExpressions:
-                  - key: node-role.kubernetes.io/master
-                    operator: Exists
     ---
     apiVersion: rbac.authorization.k8s.io/v1
     kind: RoleBinding