Skip to content

Commit 4f4499b

Browse files
sbueringersbueringer
authored
Merge pull request #3616 from fabriziopandini/bump-1.34
2 parents 1991aaa + b66a3e5 commit 4f4499b

File tree

6 files changed

+24
-15
lines changed

6 files changed

+24
-15
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export GO111MODULE=on
4444
#
4545
# Kubebuilder.
4646
#
47-
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.33.0
47+
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.34.0
4848
export KUBEBUILDER_CONTROLPLANE_START_TIMEOUT ?= 60s
4949
export KUBEBUILDER_CONTROLPLANE_STOP_TIMEOUT ?= 60s
5050

‎internal/test/helpers/vcsim/model.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ var (
4141
"ubuntu-2404-kube-v1.31.0",
4242
"ubuntu-2404-kube-v1.32.0",
4343
"ubuntu-2404-kube-v1.33.0",
44+
"ubuntu-2404-kube-v1.34.0",
4445
}
4546
)
4647

‎test/e2e/config/config-overrides-example.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ variables:
1313
VSPHERE_DATASTORE: "WorkloadDatastore"
1414
VSPHERE_STORAGE_POLICY: "Cluster API vSphere Storage Policy"
1515
VSPHERE_NETWORK: "network-1"
16-
VSPHERE_TEMPLATE: "ubuntu-2404-kube-v1.33.0"
17-
FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-4152.2.2-kube-v1.33.0"
16+
VSPHERE_TEMPLATE: "ubuntu-2404-kube-v1.34.0"
17+
FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-4230.2.2-kube-v1.34.0"
1818
CONTROL_PLANE_ENDPOINT_IP: "10.0.0.10"
1919
# Only for clusterctl upgrade tests
2020
# WORKLOAD_CONTROL_PLANE_ENDPOINT_IP:
@@ -27,7 +27,7 @@ variables:
2727
VSPHERE2_SERVER: "vcenter2.vmware.com"
2828
VSPHERE2_TLS_THUMBPRINT: "AA:BB:CC:DD:11:22:33:44:EE:FF"
2929
VSPHERE2_RESOURCE_POOL: "ResourcePool"
30-
VSPHERE2_TEMPLATE: "ubuntu-2404-kube-v1.33.0"
30+
VSPHERE2_TEMPLATE: "ubuntu-2404-kube-v1.34.0"
3131
VSPHERE2_CONTROL_PLANE_ENDPOINT_IP: "10.0.0.11"
3232
# Also following variables are required but it is recommended to use env variables to avoid disclosure of sensitive data
3333
# VSPHERE2_USERNAME:

‎test/e2e/config/vsphere.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -276,11 +276,11 @@ providers:
276276

277277
variables:
278278
# Ensure all Kubernetes versions used here are covered in patch-vsphere-template.yaml
279-
KUBERNETES_VERSION_MANAGEMENT: "v1.34.0-beta.0"
279+
KUBERNETES_VERSION_MANAGEMENT: "v1.34.0"
280280
KUBERNETES_VERSION_MANAGEMENT_LATEST_CI: "ci/latest-1.34"
281-
KUBERNETES_VERSION: "v1.34.0-beta.0"
281+
KUBERNETES_VERSION: "v1.34.0"
282282
KUBERNETES_VERSION_UPGRADE_FROM: "v1.33.0"
283-
KUBERNETES_VERSION_UPGRADE_TO: "v1.34.0-beta.0"
283+
KUBERNETES_VERSION_UPGRADE_TO: "v1.34.0"
284284
KUBERNETES_VERSION_LATEST_CI: "ci/latest-1.34"
285285
CPI_IMAGE_K8S_VERSION: "v1.34.0-rc.0"
286286
CNI: "./data/cni/calico/calico.yaml"
@@ -307,12 +307,12 @@ variables:
307307
VSPHERE_MACHINE_CLASS_CPU_CONFORMANCE: "2"
308308
VSPHERE_MACHINE_CLASS_MEMORY_CONFORMANCE: "2Gi"
309309
VSPHERE_CONTENT_LIBRARY: "capv"
310-
VSPHERE_CONTENT_LIBRARY_ITEMS: "ubuntu-2204-kube-v1.28.0,ubuntu-2204-kube-v1.29.0,ubuntu-2204-kube-v1.30.0,ubuntu-2404-kube-v1.31.0,ubuntu-2404-kube-v1.32.0,ubuntu-2404-kube-v1.33.0"
311-
VSPHERE_IMAGE_NAME: "ubuntu-2404-kube-v1.33.0"
310+
VSPHERE_CONTENT_LIBRARY_ITEMS: "ubuntu-2204-kube-v1.28.0,ubuntu-2204-kube-v1.29.0,ubuntu-2204-kube-v1.30.0,ubuntu-2404-kube-v1.31.0,ubuntu-2404-kube-v1.32.0,ubuntu-2404-kube-v1.33.0,ubuntu-2404-kube-v1.34.0"
311+
VSPHERE_IMAGE_NAME: "ubuntu-2404-kube-v1.34.0"
312312
VSPHERE_NETWORK: "k8s-ci"
313313
VSPHERE_DISTRIBUTED_PORT_GROUP: "/Datacenter/network/k8s-ci"
314-
VSPHERE_TEMPLATE: "ubuntu-2404-kube-v1.33.0"
315-
FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-4152.2.2-kube-v1.33.0"
314+
VSPHERE_TEMPLATE: "ubuntu-2404-kube-v1.34.0"
315+
FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-4230.2.2-kube-v1.34.0"
316316
KUBETEST_CONFIGURATION: "./data/kubetest/conformance.yaml"
317317
NODE_DRAIN_TIMEOUT_SECONDS: "60"
318318
EXP_CLUSTER_RESOURCE_SET: "true"

‎test/e2e/data/infrastructure-vsphere-govmomi/main/clusterclass/patch-vsphere-template.yaml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@
1919
ubuntu-2404-kube-v1.31.0
2020
{{- else if eq .builtin.controlPlane.version "v1.32.0" -}}
2121
ubuntu-2404-kube-v1.32.0
22-
{{- else -}}
22+
{{- else if eq .builtin.controlPlane.version "v1.33.0" -}}
2323
ubuntu-2404-kube-v1.33.0
24+
{{- else -}}
25+
ubuntu-2404-kube-v1.34.0
2426
{{- end -}}
2527
selector:
2628
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
@@ -44,8 +46,10 @@
4446
ubuntu-2404-kube-v1.31.0
4547
{{- else if eq .builtin.controlPlane.version "v1.32.0" -}}
4648
ubuntu-2404-kube-v1.32.0
47-
{{- else -}}
49+
{{- else if eq .builtin.controlPlane.version "v1.33.0" -}}
4850
ubuntu-2404-kube-v1.33.0
51+
{{- else -}}
52+
ubuntu-2404-kube-v1.34.0
4953
{{- end -}}
5054
selector:
5155
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1

‎test/e2e/data/infrastructure-vsphere-supervisor/main/clusterclass/patch-vsphere-template.yaml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@
1919
ubuntu-2404-kube-v1.31.0
2020
{{- else if eq .builtin.controlPlane.version "v1.32.0" -}}
2121
ubuntu-2404-kube-v1.32.0
22-
{{- else -}}
22+
{{- else if eq .builtin.controlPlane.version "v1.33.0" -}}
2323
ubuntu-2404-kube-v1.33.0
24+
{{- else -}}
25+
ubuntu-2404-kube-v1.34.0
2426
{{- end -}}
2527
selector:
2628
apiVersion: vmware.infrastructure.cluster.x-k8s.io/v1beta1
@@ -44,8 +46,10 @@
4446
ubuntu-2404-kube-v1.31.0
4547
{{- else if eq .builtin.controlPlane.version "v1.32.0" -}}
4648
ubuntu-2404-kube-v1.32.0
47-
{{- else -}}
49+
{{- else if eq .builtin.controlPlane.version "v1.33.0" -}}
4850
ubuntu-2404-kube-v1.33.0
51+
{{- else -}}
52+
ubuntu-2404-kube-v1.34.0
4953
{{- end -}}
5054
selector:
5155
apiVersion: vmware.infrastructure.cluster.x-k8s.io/v1beta1

0 commit comments

Comments
 (0)