From 56fb890456d5ce477a9dc66cdd57ba3ed3f3d917 Mon Sep 17 00:00:00 2001 From: Peppi-Lotta Date: Fri, 13 Dec 2024 10:25:30 +0200 Subject: [PATCH] Bump k8s to v.1.32.0 Signed-off-by: Peppi-Lotta --- docs/api.md | 14 +++++++------- docs/architecture.md | 2 +- docs/dev-setup.md | 2 +- examples/generate.sh | 6 +++--- hack/ensure-kubectl.sh | 2 +- hack/gen_tilt_settings.sh | 2 +- scripts/environment.sh | 2 +- test/e2e/upgrade_clusterctl_test.go | 6 +++--- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/api.md b/docs/api.md index 7f4c57d59d..cc741764c5 100644 --- a/docs/api.md +++ b/docs/api.md @@ -127,7 +127,7 @@ spec: rollingUpdate: maxSurge: 1 type: RollingUpdate - version: v1.31.2 + version: v1.32.0 kubeadmConfigSpec: joinConfiguration: controlPlane: {} @@ -243,7 +243,7 @@ spec: namespace: metal3 nodeDrainTimeout: 0s providerID: metal3://68be298f-ed11-439e-9d51-6c5260faede6 - version: v1.31.2 + version: v1.32.0 ``` ## Metal3Machine @@ -413,10 +413,10 @@ metadata: spec: automatedCleaningMode: metadata image: - checksum: http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.31.2-raw.img.sha256sum + checksum: http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.32.0-raw.img.sha256sum checksumType: sha256 format: raw - url: http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.31.2-raw.img + url: http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.32.0-raw.img hostSelector: matchLabels: key1: value1 @@ -473,7 +473,7 @@ spec: name: md-0 apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: Metal3MachineTemplate - version: v1.31.2 + version: v1.32.0 ``` ## KubeadmConfigTemplate @@ -557,10 +557,10 @@ spec: spec: automatedCleaningMode: metadata image: - checksum: http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.31.2-raw.img.sha256sum + checksum: http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.32.0-raw.img.sha256sum checksumType: sha256 format: raw - url: http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.31.2-raw.img + url: http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.32.0-raw.img hostSelector: matchLabels: key1: value1 diff --git a/docs/architecture.md b/docs/architecture.md index 3b52d3f3f2..a0378b358d 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -404,7 +404,7 @@ spec: etcd: {} imageRepository: "" kind: ClusterConfiguration - kubernetesVersion: v1.31.2 + kubernetesVersion: v1.32.0 networking: dnsDomain: cluster.local podSubnet: 192.168.0.0/18 diff --git a/docs/dev-setup.md b/docs/dev-setup.md index 4632cd6055..756267c4b9 100644 --- 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.31.2", + "KUBERNETES_VERSION": "v1.32.0", "WORKER_MACHINE_COUNT": "2", } } diff --git a/examples/generate.sh b/examples/generate.sh index d2aa5877e5..1603ec4c37 100755 --- 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.31.2}" +export KUBERNETES_VERSION="${KUBERNETES_VERSION:-v1.32.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.31.2-raw.img}" -export IMAGE_CHECKSUM="${IMAGE_CHECKSUM:-http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.31.2-raw.img.sha256sum}" +export IMAGE_URL="${IMAGE_URL:-http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.32.0-raw.img}" +export IMAGE_CHECKSUM="${IMAGE_CHECKSUM:-http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.32.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 index dae25a0a03..4c89dc6679 100755 --- 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.31.2"} +MINIMUM_KUBECTL_VERSION=${KUBERNETES_VERSION:-"v1.32.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 index f9b3967b26..6a2d74f478 100755 --- a/hack/gen_tilt_settings.sh +++ b/hack/gen_tilt_settings.sh @@ -63,7 +63,7 @@ cat <tilt-settings.json { "capi_version": "${CAPIRELEASE}", "cert_manager_version": "v1.12.3", - "kubernetes_version": "${KUBERNETES_VERSION:-v1.31.2}" + "kubernetes_version": "${KUBERNETES_VERSION:-v1.32.0}" } EOF fi diff --git a/scripts/environment.sh b/scripts/environment.sh index 02c47bd780..f5c31685f8 100644 --- a/scripts/environment.sh +++ b/scripts/environment.sh @@ -49,7 +49,7 @@ else fi export FROM_K8S_VERSION=${FROM_K8S_VERSION:-"v1.30.0"} -export KUBERNETES_VERSION=${KUBERNETES_VERSION:-"v1.31.2"} +export KUBERNETES_VERSION=${KUBERNETES_VERSION:-"v1.32.0"} # Can be overriden from jjbs export CAPI_VERSION=${CAPI_VERSION:-"v1beta1"} diff --git a/test/e2e/upgrade_clusterctl_test.go b/test/e2e/upgrade_clusterctl_test.go index fe6593dac5..d7d7596b2f 100644 --- a/test/e2e/upgrade_clusterctl_test.go +++ b/test/e2e/upgrade_clusterctl_test.go @@ -33,7 +33,7 @@ var _ = Describe("When testing cluster upgrade from releases (v1.8=>current) [cl osType := strings.ToLower(os.Getenv("OS")) Expect(osType).ToNot(Equal("")) validateGlobals(specName) - imageURL, imageChecksum := EnsureImage("v1.31.2") + imageURL, imageChecksum := EnsureImage("v1.32.0") os.Setenv("IMAGE_RAW_CHECKSUM", imageChecksum) os.Setenv("IMAGE_RAW_URL", imageURL) // We need to override clusterctl apply log folder to avoid getting our credentials exposed. @@ -57,8 +57,8 @@ var _ = Describe("When testing cluster upgrade from releases (v1.8=>current) [cl InitWithBootstrapProviders: []string{fmt.Sprintf(providerKubeadmPrefix, capiStableRelease)}, InitWithControlPlaneProviders: []string{fmt.Sprintf(providerKubeadmPrefix, capiStableRelease)}, InitWithInfrastructureProviders: []string{fmt.Sprintf(providerMetal3Prefix, capm3StableRelease)}, - InitWithKubernetesVersion: "v1.31.2", - WorkloadKubernetesVersion: "v1.31.2", + InitWithKubernetesVersion: "v1.32.0", + WorkloadKubernetesVersion: "v1.32.0", InitWithBinary: fmt.Sprintf(clusterctlDownloadURL, capiStableRelease), PreInit: func(clusterProxy framework.ClusterProxy) { preInitFunc(clusterProxy, "0.8", "26.0")