From c6100c2ae6d111b902f6035ace37cf15f61b6756 Mon Sep 17 00:00:00 2001 From: Kashif Khan Date: Fri, 7 Feb 2025 11:41:44 +0200 Subject: [PATCH] Bump k8s to v1.32.1 Bumps e2e integration and upgrade tests to use k8s v1.32.1 Signed-off-by: Kashif Khan --- docs/e2e-test.md | 8 ++-- examples/generate.sh | 6 +-- hack/ensure-kubectl.sh | 2 +- hack/gen_tilt_settings.sh | 2 +- scripts/environment.sh | 2 +- test/e2e/config/e2e_conf.yaml | 60 ++++++++++++++--------------- test/e2e/upgrade_clusterctl_test.go | 2 +- 7 files changed, 41 insertions(+), 41 deletions(-) diff --git a/docs/e2e-test.md b/docs/e2e-test.md index cccbdafa95..7a340f2a23 100644 --- a/docs/e2e-test.md +++ b/docs/e2e-test.md @@ -200,9 +200,9 @@ clusters: | tests | bootstrap cluster | metal3 cluster init | metal3 cluster final | | ------------------- | ----------------- | ------------------- | -------------------- | -| integration | v1.32.0 | v1.32.0 | x | -| remediation | v1.32.0 | v1.31.2 | x | -| pivot based feature | v1.32.0 | v1.31.2 | v1.32.0 | -| upgrade | v1.32.0 | v1.31.2 | v1.32.0 | +| 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 | diff --git a/examples/generate.sh b/examples/generate.sh index 1603ec4c37..6cb53ca0a1 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.32.0}" +export KUBERNETES_VERSION="${KUBERNETES_VERSION:-v1.32.1}" 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.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_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_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 4c89dc6679..fd40075387 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.32.0"} +MINIMUM_KUBECTL_VERSION=${KUBERNETES_VERSION:-"v1.32.1"} # 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 6a2d74f478..75ef021080 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.32.0}" + "kubernetes_version": "${KUBERNETES_VERSION:-v1.32.1}" } EOF fi diff --git a/scripts/environment.sh b/scripts/environment.sh index 0a7e7aae48..62013a611b 100644 --- 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.0"} +export KUBERNETES_VERSION=${KUBERNETES_VERSION:-"v1.32.1"} # 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 index edbf070bb3..99fff962bf 100644 --- a/test/e2e/config/e2e_conf.yaml +++ b/test/e2e/config/e2e_conf.yaml @@ -240,7 +240,7 @@ providers: variables: CNI: "/tmp/calico.yaml" - KUBERNETES_VERSION: "v1.32.0" + KUBERNETES_VERSION: "v1.32.1" # 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. @@ -300,32 +300,32 @@ variables: FKAS_RELEASE_LATEST: "data/fkas" intervals: - default/wait-controllers: ["10m", "10s"] - default/wait-cluster: ["20m", "30s"] # The second time to check the availibility of the cluster should happen late, so kcp object has time to be created - default/wait-control-plane: ["30m", "10s"] - default/wait-worker-nodes: ["60m", "10s"] - default/wait-delete-cluster: ["40m", "10s"] - default/wait-machine-upgrade: ["50m", "10s"] - default/wait-machine-remediation: ["30m", "10s"] - default/wait-vm-state: ["20m", "100ms"] - default/wait-nodes-ready: ["15m", "5s"] - default/monitor-vm-state: ["1m", "500ms"] - default/monitor-provisioning: ["5m", "500ms"] - default/wait-deployment: ["30m", "10s"] - default/wait-job: ["10m", "10s"] - default/wait-service: ["10m", "10s"] - default/wait-object-provisioned: ["10m", "10s"] - default/wait-cp-available: ["50m", "30s"] - default/wait-bmh-deprovisioning: ["50m", "10s"] - default/wait-bmh-available: ["50m", "20s"] - default/wait-bmh-inspecting: ["10m", "2s"] - default/wait-machine-deleting: ["15m", "2s"] - default/wait-bmh-deprovisioning-available: ["7m", "500ms"] - default/wait-bmh-available-provisioning: ["15m", "2s"] - default/wait-machine-running: ["50m", "20s"] - default/wait-bmh-provisioned: ["50m", "20s"] - default/wait-pod-restart: ["6m", "10s"] - default/wait-deprovision-cluster: ["30m", "10s"] - default/wait-all-pod-to-be-running-on-target-cluster: ["30m", "10s"] - default/wait-command: ["2m", "10s"] - default/wait-delete-remediation-template: ["5m", "10s"] + default/wait-controllers: [ "10m", "10s" ] + default/wait-cluster: [ "20m", "30s" ] # The second time to check the availibility of the cluster should happen late, so kcp object has time to be created + default/wait-control-plane: [ "30m", "10s" ] + default/wait-worker-nodes: [ "60m", "10s" ] + default/wait-delete-cluster: [ "40m", "10s" ] + default/wait-machine-upgrade: [ "50m", "10s" ] + default/wait-machine-remediation: [ "30m", "10s" ] + default/wait-vm-state: [ "20m", "100ms" ] + default/wait-nodes-ready: [ "15m", "5s" ] + default/monitor-vm-state: [ "1m", "500ms" ] + default/monitor-provisioning: [ "5m", "500ms" ] + default/wait-deployment: [ "30m", "10s" ] + default/wait-job: [ "10m", "10s" ] + default/wait-service: [ "10m", "10s" ] + default/wait-object-provisioned: [ "10m", "10s" ] + default/wait-cp-available: [ "50m", "30s" ] + default/wait-bmh-deprovisioning: [ "50m", "10s" ] + default/wait-bmh-available: [ "50m", "20s" ] + default/wait-bmh-inspecting: [ "10m", "2s" ] + default/wait-machine-deleting: [ "15m", "2s" ] + default/wait-bmh-deprovisioning-available: [ "7m", "500ms" ] + default/wait-bmh-available-provisioning: [ "15m", "2s" ] + default/wait-machine-running: [ "50m", "20s" ] + default/wait-bmh-provisioned: [ "50m", "20s" ] + default/wait-pod-restart: [ "6m", "10s" ] + default/wait-deprovision-cluster: [ "30m", "10s" ] + default/wait-all-pod-to-be-running-on-target-cluster: [ "30m", "10s" ] + default/wait-command: [ "2m", "10s" ] + default/wait-delete-remediation-template: [ "5m", "10s" ] diff --git a/test/e2e/upgrade_clusterctl_test.go b/test/e2e/upgrade_clusterctl_test.go index 69c6bae7fe..f66365b83b 100644 --- a/test/e2e/upgrade_clusterctl_test.go +++ b/test/e2e/upgrade_clusterctl_test.go @@ -32,7 +32,7 @@ var ( var _ = Describe("When testing cluster upgrade from releases (v1.9=>current) [clusterctl-upgrade]", func() { BeforeEach(func() { - k8sVersion = "v1.32.0" + k8sVersion = "v1.32.1" validateGlobals(specName) imageURL, imageChecksum := EnsureImage(k8sVersion) os.Setenv("IMAGE_RAW_CHECKSUM", imageChecksum)