bump KUBERNETES_VERSION + refactor loading

Author: damdo

hack/ensure-yq.sh

@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+
+# Copyright 2025 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+YQ_VERSION="v4.45.4"
+
+# Check if Go is installed
+if ! command -v go &> /dev/null; then
+    echo "Error: go is not installed. Please install go first."
+    exit 1
+fi
+
+# Install yq only if not already installed
+if ! [ -x "$(command -v yq)" ]; then
+    echo 'yq not found, installing'
+    go install "github.com/mikefarah/yq/v4@${YQ_VERSION}"
+
+    # Check if installation was successful
+    if ! [ -x "$(command -v yq)" ]; then
+        echo "error: yq installation failed."
+        exit 1
+    fi
+
+    echo "yq ${YQ_VERSION} has been successfully installed."
+fi

scripts/ci-e2e.sh

@@ -32,6 +32,8 @@ make --directory="${REPO_ROOT}" "${KUBECTL##*/}" "${KIND##*/}"
 source "${REPO_ROOT}/hack/ensure-go.sh"
 # shellcheck source=hack/ensure-kustomize.sh
 source "${REPO_ROOT}/hack/ensure-kustomize.sh"
+# shellcheck source=hack/ensure-yq.sh
+source "${REPO_ROOT}/hack/ensure-yq.sh"
 
 # Configure e2e tests
 export GINKGO_NODES=3
@@ -47,10 +49,12 @@ export TEST_NAME=${CLUSTER_NAME:-"capg-${RANDOM}"}
 export GCP_NETWORK_NAME=${GCP_NETWORK_NAME:-"${TEST_NAME}-mynetwork"}
 GCP_B64ENCODED_CREDENTIALS=$(base64 "$GOOGLE_APPLICATION_CREDENTIALS" | tr -d '\n')
 export GCP_B64ENCODED_CREDENTIALS
-export KUBERNETES_MAJOR_VERSION="1"
-export KUBERNETES_MINOR_VERSION="27"
-export KUBERNETES_PATCH_VERSION="3"
-export KUBERNETES_VERSION="v${KUBERNETES_MAJOR_VERSION}.${KUBERNETES_MINOR_VERSION}.${KUBERNETES_PATCH_VERSION}"
+KUBERNETES_VERSION=$(yq '.variables.KUBERNETES_VERSION' test/e2e/config/gcp-ci.yaml)
+export KUBERNETES_VERSION
+read -ra VERSION_PARTS <<< "$(echo "${KUBERNETES_VERSION#v}" | tr '.' ' ')"
+export KUBERNETES_MAJOR_VERSION="${VERSION_PARTS[0]}"
+export KUBERNETES_MINOR_VERSION="${VERSION_PARTS[1]}"
+export KUBERNETES_PATCH_VERSION="${VERSION_PARTS[2]}"
 # 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
 export IMAGE_ID="projects/k8s-staging-cluster-api-gcp/global/images/cluster-api-ubuntu-2204-${KUBERNETES_VERSION//[.+]/-}-nightly"
 

test/e2e/config/gcp-ci.yaml

@@ -75,7 +75,7 @@ providers:
       - sourcePath: "${PWD}/test/e2e/data/infrastructure-gcp/cluster-template-ci-with-internal-lb.yaml"
 
 variables:
-  KUBERNETES_VERSION: "${KUBERNETES_VERSION:-v1.31.0}"
+  KUBERNETES_VERSION: "v1.30.0"
   KUBERNETES_VERSION_MANAGEMENT: "v1.31.0"
   ETCD_VERSION_UPGRADE_TO: "3.5.14-0"
   COREDNS_VERSION_UPGRADE_TO: "v1.11.3"