From 2412cb220456eac3037c83509b7756c981e5c0e3 Mon Sep 17 00:00:00 2001 From: Christian Schlotter Date: Tue, 13 Aug 2024 10:48:03 +0200 Subject: [PATCH] Bump e2e tests to kubernetes v1.31.0 --- internal/test/helpers/vcsim/model.go | 1 + .../flavorgen/cloudprovider/cpi/cpi.yaml | 46 ++++++++----------- ...luster-template-external-loadbalancer.yaml | 44 ++++++++---------- templates/cluster-template-ignition.yaml | 44 ++++++++---------- templates/cluster-template-node-ipam.yaml | 44 ++++++++---------- templates/cluster-template-supervisor.yaml | 44 ++++++++---------- .../cluster-template-topology-supervisor.yaml | 44 ++++++++---------- templates/cluster-template-topology.yaml | 44 ++++++++---------- templates/cluster-template.yaml | 44 ++++++++---------- test/e2e/config/config-overrides-example.yaml | 6 +-- test/e2e/config/vsphere.yaml | 18 ++++---- .../clusterclass/patch-vsphere-template.yaml | 16 ++++--- .../clusterclass/patch-vsphere-template.yaml | 16 ++++--- 13 files changed, 186 insertions(+), 225 deletions(-) diff --git a/internal/test/helpers/vcsim/model.go b/internal/test/helpers/vcsim/model.go index 2fcc4671bc..e6022d447f 100644 --- 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 index c1a62544bd..aba5e2bb76 100644 --- 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 index 31c9b28f4b..2da8c3c670 100644 --- 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 index ba0c4062f7..033ef4d6be 100644 --- 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 index c7e38909d2..8ed65b06a5 100644 --- 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 index ffb9887979..a51d2b0b76 100644 --- 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 index b680f426a8..0dc8ef8b9b 100644 --- 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 diff --git a/templates/cluster-template-topology.yaml b/templates/cluster-template-topology.yaml index e976f8cafd..d4c548b0e4 100644 --- a/templates/cluster-template-topology.yaml +++ b/templates/cluster-template-topology.yaml @@ -1166,21 +1166,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 @@ -1204,16 +1208,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.yaml b/templates/cluster-template.yaml index 12f283b0fe..205fd40824 100644 --- a/templates/cluster-template.yaml +++ b/templates/cluster-template.yaml @@ -1383,21 +1383,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 @@ -1421,16 +1425,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/test/e2e/config/config-overrides-example.yaml b/test/e2e/config/config-overrides-example.yaml index afdcc9fef2..bc3f9bc064 100644 --- a/test/e2e/config/config-overrides-example.yaml +++ b/test/e2e/config/config-overrides-example.yaml @@ -13,8 +13,8 @@ variables: VSPHERE_DATASTORE: "WorkloadDatastore" VSPHERE_STORAGE_POLICY: "Cluster API vSphere Storage Policy" VSPHERE_NETWORK: "network-1" - VSPHERE_TEMPLATE: "ubuntu-2204-kube-v1.30.0" - FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-3815.2.2-kube-v1.30.0" + VSPHERE_TEMPLATE: "ubuntu-2204-kube-v1.31.0" + FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-3975.2.0-kube-v1.31.0" CONTROL_PLANE_ENDPOINT_IP: "10.0.0.10" # Only for clusterctl upgrade tests # WORKLOAD_CONTROL_PLANE_ENDPOINT_IP: @@ -27,7 +27,7 @@ variables: VSPHERE2_SERVER: "vcenter2.vmware.com" VSPHERE2_TLS_THUMBPRINT: "AA:BB:CC:DD:11:22:33:44:EE:FF" VSPHERE2_RESOURCE_POOL: "ResourcePool" - VSPHERE2_TEMPLATE: "ubuntu-2204-kube-v1.30.0" + VSPHERE2_TEMPLATE: "ubuntu-2204-kube-v1.31.0" VSPHERE2_CONTROL_PLANE_ENDPOINT_IP: "10.0.0.11" # Also following variables are required but it is recommended to use env variables to avoid disclosure of sensitive data # VSPHERE2_USERNAME: diff --git a/test/e2e/config/vsphere.yaml b/test/e2e/config/vsphere.yaml index 4c7dad4ff5..4e8bc10715 100644 --- a/test/e2e/config/vsphere.yaml +++ b/test/e2e/config/vsphere.yaml @@ -267,12 +267,12 @@ providers: variables: # Ensure all Kubernetes versions used here are covered in patch-vsphere-template.yaml - KUBERNETES_VERSION_MANAGEMENT: "v1.31.0-rc.1" - KUBERNETES_VERSION: "v1.31.0-rc.1" + KUBERNETES_VERSION_MANAGEMENT: "v1.31.0" + KUBERNETES_VERSION: "v1.31.0" KUBERNETES_VERSION_UPGRADE_FROM: "v1.30.0" - KUBERNETES_VERSION_UPGRADE_TO: "v1.31.0-rc.1" - KUBERNETES_VERSION_LATEST_CI: "ci/latest-1.31" - CPI_IMAGE_K8S_VERSION: "v1.31.0-rc.1" + KUBERNETES_VERSION_UPGRADE_TO: "v1.31.0" + KUBERNETES_VERSION_LATEST_CI: "ci/latest-1.32" + CPI_IMAGE_K8S_VERSION: "v1.31.0" CNI: "./data/cni/calico/calico.yaml" EXP_CLUSTER_RESOURCE_SET: "true" EXP_KUBEADM_BOOTSTRAP_FORMAT_IGNITION: "true" @@ -294,12 +294,12 @@ variables: VSPHERE_MACHINE_CLASS_CPU_CONFORMANCE: "8" VSPHERE_MACHINE_CLASS_MEMORY_CONFORMANCE: "8Gi" VSPHERE_CONTENT_LIBRARY: "capv" - VSPHERE_CONTENT_LIBRARY_ITEMS: "ubuntu-2204-kube-v1.28.0,ubuntu-2204-kube-v1.29.0,ubuntu-2204-kube-v1.30.0" - VSPHERE_IMAGE_NAME: "ubuntu-2204-kube-v1.30.0" + VSPHERE_CONTENT_LIBRARY_ITEMS: "ubuntu-2204-kube-v1.28.0,ubuntu-2204-kube-v1.29.0,ubuntu-2204-kube-v1.30.0,ubuntu-2204-kube-v1.31.0" + VSPHERE_IMAGE_NAME: "ubuntu-2204-kube-v1.31.0" VSPHERE_NETWORK: "sddc-cgw-network-10" VSPHERE_DISTRIBUTED_PORT_GROUP: "/SDDC-Datacenter/network/sddc-cgw-network-10" - VSPHERE_TEMPLATE: "ubuntu-2204-kube-v1.30.0" - FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-3815.2.2-kube-v1.30.0" + VSPHERE_TEMPLATE: "ubuntu-2204-kube-v1.31.0" + FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-3815.2.2-kube-v1.31.0" KUBETEST_CONFIGURATION: "./data/kubetest/conformance.yaml" NODE_DRAIN_TIMEOUT: "60s" CLUSTER_TOPOLOGY: "true" diff --git a/test/e2e/data/infrastructure-vsphere-govmomi/main/clusterclass/patch-vsphere-template.yaml b/test/e2e/data/infrastructure-vsphere-govmomi/main/clusterclass/patch-vsphere-template.yaml index 1e9bff36e8..d0eb0b0b97 100644 --- a/test/e2e/data/infrastructure-vsphere-govmomi/main/clusterclass/patch-vsphere-template.yaml +++ b/test/e2e/data/infrastructure-vsphere-govmomi/main/clusterclass/patch-vsphere-template.yaml @@ -11,11 +11,13 @@ template: |- {{- if eq .builtin.controlPlane.version "v1.28.0" -}} ubuntu-2204-kube-v1.28.0 - {{- else -}}{{- if eq .builtin.controlPlane.version "v1.29.0" -}} + {{- else if eq .builtin.controlPlane.version "v1.29.0" -}} ubuntu-2204-kube-v1.29.0 - {{- else -}} + {{- else if eq .builtin.controlPlane.version "v1.30.0" -}} ubuntu-2204-kube-v1.30.0 - {{- end -}}{{- end -}} + {{- else -}} + ubuntu-2204-kube-v1.31.0 + {{- end -}} selector: apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: VSphereMachineTemplate @@ -30,11 +32,13 @@ template: |- {{- if eq .builtin.machineDeployment.version "v1.28.0" -}} ubuntu-2204-kube-v1.28.0 - {{- else -}}{{- if eq .builtin.machineDeployment.version "v1.29.0" -}} + {{- else if eq .builtin.machineDeployment.version "v1.29.0" -}} ubuntu-2204-kube-v1.29.0 - {{- else -}} + {{- else if eq .builtin.machineDeployment.version "v1.30.0" -}} ubuntu-2204-kube-v1.30.0 - {{- end -}}{{- end -}} + {{- else -}} + ubuntu-2204-kube-v1.31.0 + {{- end -}} selector: apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: VSphereMachineTemplate diff --git a/test/e2e/data/infrastructure-vsphere-supervisor/main/clusterclass/patch-vsphere-template.yaml b/test/e2e/data/infrastructure-vsphere-supervisor/main/clusterclass/patch-vsphere-template.yaml index af98629345..aa3a9a23ef 100644 --- a/test/e2e/data/infrastructure-vsphere-supervisor/main/clusterclass/patch-vsphere-template.yaml +++ b/test/e2e/data/infrastructure-vsphere-supervisor/main/clusterclass/patch-vsphere-template.yaml @@ -11,11 +11,13 @@ template: |- {{- if eq .builtin.controlPlane.version "v1.28.0" -}} ubuntu-2204-kube-v1.28.0 - {{- else -}}{{- if eq .builtin.controlPlane.version "v1.29.0" -}} + {{- else if eq .builtin.controlPlane.version "v1.29.0" -}} ubuntu-2204-kube-v1.29.0 - {{- else -}} + {{- else if eq .builtin.controlPlane.version "v1.30.0" -}} ubuntu-2204-kube-v1.30.0 - {{- end -}}{{- end -}} + {{- else -}} + ubuntu-2204-kube-v1.31.0 + {{- end -}} selector: apiVersion: vmware.infrastructure.cluster.x-k8s.io/v1beta1 kind: VSphereMachineTemplate @@ -30,11 +32,13 @@ template: |- {{- if eq .builtin.machineDeployment.version "v1.28.0" -}} ubuntu-2204-kube-v1.28.0 - {{- else -}}{{- if eq .builtin.machineDeployment.version "v1.29.0" -}} + {{- else if eq .builtin.machineDeployment.version "v1.29.0" -}} ubuntu-2204-kube-v1.29.0 - {{- else -}} + {{- else if eq .builtin.machineDeployment.version "v1.30.0" -}} ubuntu-2204-kube-v1.30.0 - {{- end -}}{{- end -}} + {{- else -}} + ubuntu-2204-kube-v1.31.0 + {{- end -}} selector: apiVersion: vmware.infrastructure.cluster.x-k8s.io/v1beta1 kind: VSphereMachineTemplate