Skip to content

Commit 5336c3b

Browse files
committed
bump KUBERNETES_VERSION + refactor loading
1 parent 7aa05f2 commit 5336c3b

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

scripts/ci-e2e.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,12 @@ export TEST_NAME=${CLUSTER_NAME:-"capg-${RANDOM}"}
4747
export GCP_NETWORK_NAME=${GCP_NETWORK_NAME:-"${TEST_NAME}-mynetwork"}
4848
GCP_B64ENCODED_CREDENTIALS=$(base64 "$GOOGLE_APPLICATION_CREDENTIALS" | tr -d '\n')
4949
export GCP_B64ENCODED_CREDENTIALS
50-
export KUBERNETES_MAJOR_VERSION="1"
51-
export KUBERNETES_MINOR_VERSION="27"
52-
export KUBERNETES_PATCH_VERSION="3"
53-
export KUBERNETES_VERSION="v${KUBERNETES_MAJOR_VERSION}.${KUBERNETES_MINOR_VERSION}.${KUBERNETES_PATCH_VERSION}"
50+
KUBERNETES_VERSION=$(go run github.com/mikefarah/yq/[email protected] '.variables.KUBERNETES_VERSION' test/e2e/config/gcp-ci.yaml)
51+
export KUBERNETES_VERSION
52+
read -ra VERSION_PARTS <<< "$(echo "${KUBERNETES_VERSION#v}" | tr '.' ' ')"
53+
export KUBERNETES_MAJOR_VERSION="${VERSION_PARTS[0]}"
54+
export KUBERNETES_MINOR_VERSION="${VERSION_PARTS[1]}"
55+
export KUBERNETES_PATCH_VERSION="${VERSION_PARTS[2]}"
5456
# using prebuilt image from image-builder project the image is built everyday and the job is available here https://prow.k8s.io/?job=periodic-image-builder-gcp-all-nightly
5557
export IMAGE_ID="projects/k8s-staging-cluster-api-gcp/global/images/cluster-api-ubuntu-2204-${KUBERNETES_VERSION//[.+]/-}-nightly"
5658

test/e2e/config/gcp-ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ providers:
7777
- sourcePath: "${PWD}/test/e2e/data/infrastructure-gcp/cluster-template-ci-with-internal-lb.yaml"
7878

7979
variables:
80-
KUBERNETES_VERSION: "${KUBERNETES_VERSION:-v1.32.0}"
80+
KUBERNETES_VERSION: "v1.32.0"
8181
KUBERNETES_VERSION_MANAGEMENT: "v1.32.0"
8282
ETCD_VERSION_UPGRADE_TO: "3.5.16-0"
8383
COREDNS_VERSION_UPGRADE_TO: "v1.11.3"

0 commit comments

Comments
 (0)