Skip to content

Commit d10abe4

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #3726 from fabriziopandini/start-using-1.35-ova
🌱 Start using 1.35 ova
2 parents 2704790 + 47a3d46 commit d10abe4

File tree

22 files changed

+30
-159
lines changed

22 files changed

+30
-159
lines changed

‎.github/ISSUE_TEMPLATE/release_tracking.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ After the Kubernetes minor release:
6464
checking out the release tag of `https://github.com/kubernetes/cloud-provider-vsphere` and running:
6565
`helm template charts/vsphere-cpi --namespace kube-system > ../../sigs.k8s.io/cluster-api-provider-vsphere/packaging/flavorgen/cloudprovider/cpi/cpi.yaml`
6666
* Bump in:
67+
* `test/extension/handlers/topologymutation/handler.go`
6768
* `test/e2e/data/infrastructure-vsphere-govmomi/main/clusterclass/patch-vsphere-template.yaml`
6869
* `test/e2e/data/infrastructure-vsphere-supervisor/main/clusterclass/patch-vsphere-template.yaml`
6970
* Prior art: https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/pull/3294

‎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.34.0
47+
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.35.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
@@ -42,6 +42,7 @@ var (
4242
"ubuntu-2404-kube-v1.32.0",
4343
"ubuntu-2404-kube-v1.33.0",
4444
"ubuntu-2404-kube-v1.34.0",
45+
"ubuntu-2404-kube-v1.35.0",
4546
}
4647
)
4748

‎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.34.0"
17-
FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-4230.2.2-kube-v1.34.0"
16+
VSPHERE_TEMPLATE: "ubuntu-2404-kube-v1.35.0"
17+
FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-4459.2.1-kube-v1.35.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.34.0"
30+
VSPHERE2_TEMPLATE: "ubuntu-2404-kube-v1.35.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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -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,ubuntu-2404-kube-v1.34.0"
311-
VSPHERE_IMAGE_NAME: "ubuntu-2404-kube-v1.34.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,ubuntu-2404-kube-v1.35.0"
311+
VSPHERE_IMAGE_NAME: "ubuntu-2404-kube-v1.35.0"
312312
VSPHERE_NETWORK: "k8s-ci"
313313
VSPHERE_DISTRIBUTED_PORT_GROUP: "/Datacenter/network/k8s-ci"
314-
VSPHERE_TEMPLATE: "ubuntu-2404-kube-v1.34.0"
315-
FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-4230.2.2-kube-v1.34.0"
314+
VSPHERE_TEMPLATE: "ubuntu-2404-kube-v1.35.0"
315+
FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-4459.2.1-kube-v1.35.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/base/patch-k8s-install-script-kcp.yaml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,6 @@
9191
$${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
9292
$${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "gcr.io/k8s-staging-ci-images/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
9393
done
94-
95-
# TODO: remove once we use k8s v1.35 image-builder templates.
96-
# Note: This is a temporary fix to ensure the flag --pod-infra-container-image is not set which was removed in k8s v1.35 and deprecated for a long time.
97-
echo "Clearing /etc/sysconfig/kubelet and/or /etc/default/kubelet if they exist"
98-
echo "" > /etc/sysconfig/kubelet || true
99-
echo "" > /etc/default/kubelet || true
10094
fi
10195
echo "* checking binary versions"
10296
echo "ctr version: " "$(ctr version)"

‎test/e2e/data/infrastructure-vsphere-govmomi/main/base/patch-k8s-install-script-kct.yaml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,6 @@
9494
$${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
9595
$${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "gcr.io/k8s-staging-ci-images/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
9696
done
97-
98-
# TODO: remove once we use k8s v1.35 image-builder templates.
99-
# Note: This is a temporary fix to ensure the flag --pod-infra-container-image is not set which was removed in k8s v1.35 and deprecated for a long time.
100-
echo "Clearing /etc/sysconfig/kubelet and/or /etc/default/kubelet if they exist"
101-
echo "" > /etc/sysconfig/kubelet || true
102-
echo "" > /etc/default/kubelet || true
10397
fi
10498
echo "* checking binary versions"
10599
echo "ctr version: " "$(ctr version)"

‎test/e2e/data/infrastructure-vsphere-govmomi/main/clusterclass/patch-k8s-install-script.yaml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,6 @@
9696
$${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
9797
$${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "gcr.io/k8s-staging-ci-images/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
9898
done
99-
100-
# TODO: remove once we use k8s v1.35 image-builder templates.
101-
# Note: This is a temporary fix to ensure the flag --pod-infra-container-image is not set which was removed in k8s v1.35 and deprecated for a long time.
102-
echo "Clearing /etc/sysconfig/kubelet and/or /etc/default/kubelet if they exist"
103-
echo "" > /etc/sysconfig/kubelet || true
104-
echo "" > /etc/default/kubelet || true
10599
fi
106100
echo "* checking binary versions"
107101
echo "ctr version: " "$(ctr version)"
@@ -209,12 +203,6 @@
209203
$${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
210204
$${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "gcr.io/k8s-staging-ci-images/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
211205
done
212-
213-
# TODO: remove once we use k8s v1.35 image-builder templates.
214-
# Note: This is a temporary fix to ensure the flag --pod-infra-container-image is not set which was removed in k8s v1.35 and deprecated for a long time.
215-
echo "Clearing /etc/sysconfig/kubelet and/or /etc/default/kubelet if they exist"
216-
echo "" > /etc/sysconfig/kubelet || true
217-
echo "" > /etc/default/kubelet || true
218206
fi
219207
echo "* checking binary versions"
220208
echo "ctr version: " "$(ctr version)"

‎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
@@ -21,8 +21,10 @@
2121
ubuntu-2404-kube-v1.32.0
2222
{{- else if eq .builtin.controlPlane.version "v1.33.0" -}}
2323
ubuntu-2404-kube-v1.33.0
24-
{{- else -}}
24+
{{- else if eq .builtin.controlPlane.version "v1.34.0" -}}
2525
ubuntu-2404-kube-v1.34.0
26+
{{- else -}}
27+
ubuntu-2404-kube-v1.35.0
2628
{{- end -}}
2729
selector:
2830
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
@@ -48,8 +50,10 @@
4850
ubuntu-2404-kube-v1.32.0
4951
{{- else if eq .builtin.controlPlane.version "v1.33.0" -}}
5052
ubuntu-2404-kube-v1.33.0
51-
{{- else -}}
53+
{{- else if eq .builtin.controlPlane.version "v1.34.0" -}}
5254
ubuntu-2404-kube-v1.34.0
55+
{{- else -}}
56+
ubuntu-2404-kube-v1.35.0
5357
{{- end -}}
5458
selector:
5559
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1

‎test/e2e/data/infrastructure-vsphere-govmomi/v1.11/clusterclass/patch-k8s-install-script.yaml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,6 @@
9696
$${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
9797
$${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "gcr.io/k8s-staging-ci-images/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
9898
done
99-
100-
# TODO: remove once we use k8s v1.35 image-builder templates.
101-
# Note: This is a temporary fix to ensure the flag --pod-infra-container-image is not set which was removed in k8s v1.35 and deprecated for a long time.
102-
echo "Clearing /etc/sysconfig/kubelet and/or /etc/default/kubelet if they exist"
103-
echo "" > /etc/sysconfig/kubelet || true
104-
echo "" > /etc/default/kubelet || true
10599
fi
106100
echo "* checking binary versions"
107101
echo "ctr version: " "$(ctr version)"
@@ -209,12 +203,6 @@
209203
$${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
210204
$${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "gcr.io/k8s-staging-ci-images/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
211205
done
212-
213-
# TODO: remove once we use k8s v1.35 image-builder templates.
214-
# Note: This is a temporary fix to ensure the flag --pod-infra-container-image is not set which was removed in k8s v1.35 and deprecated for a long time.
215-
echo "Clearing /etc/sysconfig/kubelet and/or /etc/default/kubelet if they exist"
216-
echo "" > /etc/sysconfig/kubelet || true
217-
echo "" > /etc/default/kubelet || true
218206
fi
219207
echo "* checking binary versions"
220208
echo "ctr version: " "$(ctr version)"

0 commit comments

Comments
 (0)