Bump Kubernetes to v1.33.0

peppi-lotta · peppi-lotta · commit 46b49637c0ee · 2025-04-25T15:46:44.000+03:00
Signed-off-by: peppi-lotta &lt;peppi-lotta.saari@est.tech&gt;
diff --git a/Makefile b/Makefile
@@ -114,7 +114,7 @@ help:  # Display this help
 ## --------------------------------------
 ##@ tests:
 
-export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.32.0
+export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.33.0
 KUBEBUILDER_ASSETS ?= $(shell $(SETUP_ENVTEST) use --use-env -p path $(KUBEBUILDER_ENVTEST_KUBERNETES_VERSION))
 
 .PHONY: setup-envtest
diff --git a/docs/api.md b/docs/api.md
@@ -132,7 +132,7 @@ spec:
     rollingUpdate:
       maxSurge: 1
     type: RollingUpdate
-  version: v1.32.0
+  version: v1.33.0
   kubeadmConfigSpec:
     joinConfiguration:
       controlPlane: {}
@@ -248,7 +248,7 @@ spec:
     namespace: metal3
   nodeDrainTimeout: 0s
   providerID: metal3://68be298f-ed11-439e-9d51-6c5260faede6
-  version: v1.32.0
+  version: v1.33.0
 ```
 
 ## Metal3Machine
@@ -418,10 +418,10 @@ metadata:
 spec:
   automatedCleaningMode: metadata
   image:
-    checksum: http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.32.0-raw.img.sha256sum
+    checksum: http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.33.0-raw.img.sha256sum
     checksumType: sha256
     format: raw
-    url: http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.32.0-raw.img
+    url: http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.33.0-raw.img
   hostSelector:
     matchLabels:
       key1: value1
@@ -478,7 +478,7 @@ spec:
         name: md-0
         apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
         kind: Metal3MachineTemplate
-      version: v1.32.0
+      version: v1.33.0
 ```
 
 ## KubeadmConfigTemplate
@@ -562,10 +562,10 @@ spec:
     spec:
       automatedCleaningMode: metadata
       image:
-        checksum: http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.32.0-raw.img.sha256sum
+        checksum: http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.33.0-raw.img.sha256sum
         checksumType: sha256
         format: raw
-        url: http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.32.0-raw.img
+        url: http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.33.0-raw.img
       hostSelector:
         matchLabels:
           key1: value1
diff --git a/docs/architecture.md b/docs/architecture.md
@@ -404,7 +404,7 @@ spec:
     etcd: {}
     imageRepository: ""
     kind: ClusterConfiguration
-    kubernetesVersion: v1.32.0
+    kubernetesVersion: v1.33.0
     networking:
       dnsDomain: cluster.local
       podSubnet: 192.168.0.0/18
diff --git a/docs/dev-setup.md b/docs/dev-setup.md
@@ -287,7 +287,7 @@ Please note, the precedence of variables is as follows:
         },
         "metadata": {,
             "CONTROL_PLANE_MACHINE_COUNT": "1",
-            "KUBERNETES_VERSION": "v1.32.0",
+            "KUBERNETES_VERSION": "v1.33.0",
             "WORKER_MACHINE_COUNT": "2",
         }
     }
diff --git a/docs/e2e-test.md b/docs/e2e-test.md
@@ -199,10 +199,10 @@ clusters:
 <!-- markdownlint-disable MD013 -->
 
 | tests               | bootstrap cluster | metal3 cluster init | metal3 cluster final |
-| ------------------- | ----------------- | ------------------- | -------------------- |
-| integration         | v1.32.1           | v1.32.1             | x                    |
-| remediation         | v1.32.1           | v1.31.2             | x                    |
-| pivot based feature | v1.32.1           | v1.31.2             | v1.32.1              |
-| upgrade             | v1.32.1           | v1.31.2             | v1.32.1              |
+| ------------------- | ----------------- | -------------------- | -------------------- |
+| integration         | v1.33.0           | v1.33.0              | x                    |
+| remediation         | v1.33.0           | v1.33.0              | x                    |
+| pivot based feature | v1.33.0           | v1.33.0              | v1.33.0              |
+| upgrade             | v1.33.0           | v1.33.0              | v1.33.0              |
 
 <!-- markdownlint-enable MD013 -->
diff --git a/examples/generate.sh b/examples/generate.sh
@@ -24,11 +24,11 @@ KUSTOMIZE="${SOURCE_DIR}/../hack/tools/bin/kustomize"
 
 # Cluster.
 export CLUSTER_NAME="${CLUSTER_NAME:-test1}"
-export KUBERNETES_VERSION="${KUBERNETES_VERSION:-v1.32.1}"
+export KUBERNETES_VERSION="${KUBERNETES_VERSION:-v1.33.0}"
 export CLUSTER_APIENDPOINT_HOST="${CLUSTER_APIENDPOINT_HOST:-192.168.111.249}"
 export CLUSTER_APIENDPOINT_PORT="${CLUSTER_APIENDPOINT_PORT:-6443}"
-export IMAGE_URL="${IMAGE_URL:-http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.32.1-raw.img}"
-export IMAGE_CHECKSUM="${IMAGE_CHECKSUM:-http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.32.1-raw.img.sha256sum}"
+export IMAGE_URL="${IMAGE_URL:-http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.33.0-raw.img}"
+export IMAGE_CHECKSUM="${IMAGE_CHECKSUM:-http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.33.0-raw.img.sha256sum}"
 export IMAGE_CHECKSUM_TYPE="${IMAGE_CHECKSUM_TYPE:-sha256}"
 export IMAGE_FORMAT="${IMAGE_FORMAT:-raw}"
 
diff --git a/hack/ensure-kubectl.sh b/hack/ensure-kubectl.sh
@@ -19,7 +19,7 @@ set -o nounset
 set -o pipefail
 
 GOPATH_BIN="$(go env GOPATH)/bin/"
-MINIMUM_KUBECTL_VERSION=${KUBERNETES_VERSION:-"v1.32.1"}
+MINIMUM_KUBECTL_VERSION=${KUBERNETES_VERSION:-"v1.33.0"}
 
 # Ensure the kubectl tool exists and is a viable version, or installs it
 verify_kubectl_version()
diff --git a/hack/gen_tilt_settings.sh b/hack/gen_tilt_settings.sh
@@ -63,7 +63,7 @@ cat <<EOF >tilt-settings.json
 {
     "capi_version": "${CAPIRELEASE}",
     "cert_manager_version": "v1.12.3",
-    "kubernetes_version": "${KUBERNETES_VERSION:-v1.32.1}"
+    "kubernetes_version": "${KUBERNETES_VERSION:-v1.33.0}"
 }
 EOF
 fi
diff --git a/scripts/environment.sh b/scripts/environment.sh
@@ -49,7 +49,7 @@ else
 fi
 
 export FROM_K8S_VERSION=${FROM_K8S_VERSION:-"v1.31.2"}
-export KUBERNETES_VERSION=${KUBERNETES_VERSION:-"v1.32.1"}
+export KUBERNETES_VERSION=${KUBERNETES_VERSION:-"v1.33.0"}
 
 # Can be overriden from jjbs
 export CAPI_VERSION=${CAPI_VERSION:-"v1beta1"}
diff --git a/test/e2e/config/e2e_conf.yaml b/test/e2e/config/e2e_conf.yaml
@@ -166,7 +166,7 @@ providers:
 
 variables:
   CNI: "/tmp/calico.yaml"
-  KUBERNETES_VERSION: "v1.32.1"
+  KUBERNETES_VERSION: "v1.33.0"
   # KUBERNETES_PATCH_FROM_VERSION and KUBERNETES_PATCH_TO_VERSION are used to
   # test upgrade scenarios where we only want to upgrade the patch version of
   # kubernetes.
diff --git a/test/e2e/upgrade_clusterctl_test.go b/test/e2e/upgrade_clusterctl_test.go
@@ -39,7 +39,7 @@ var (
 
 var _ = Describe("When testing cluster upgrade from releases (v1.9=>current) [clusterctl-upgrade]", func() {
 	BeforeEach(func() {
-		k8sVersion = "v1.32.1"
+		k8sVersion = "v1.33.0"
 		validateGlobals(specName)
 		imageURL, imageChecksum := EnsureImage(k8sVersion)
 		os.Setenv("IMAGE_RAW_CHECKSUM", imageChecksum)

Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,7 @@ Please note, the precedence of variables is as follows:`
`287`	`287`	`},`
`288`	`288`	`"metadata": {,`
`289`	`289`	`"CONTROL_PLANE_MACHINE_COUNT": "1",`
`290`		`- "KUBERNETES_VERSION": "v1.32.0",`
	`290`	`+ "KUBERNETES_VERSION": "v1.33.0",`
`291`	`291`	`"WORKER_MACHINE_COUNT": "2",`
`292`	`292`	`}`
`293`	`293`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ cat <<EOF >tilt-settings.json`
`63`	`63`	`{`
`64`	`64`	`"capi_version": "${CAPIRELEASE}",`
`65`	`65`	`"cert_manager_version": "v1.12.3",`
`66`		`- "kubernetes_version": "${KUBERNETES_VERSION:-v1.32.1}"`
	`66`	`+ "kubernetes_version": "${KUBERNETES_VERSION:-v1.33.0}"`
`67`	`67`	`}`
`68`	`68`	`EOF`
`69`	`69`	`fi`