diff --git a/.github/workflows/gke_e2e_tests.yaml b/.github/workflows/gke_e2e_tests.yaml index a0bdfaacb50..298c562d9d8 100644 --- a/.github/workflows/gke_e2e_tests.yaml +++ b/.github/workflows/gke_e2e_tests.yaml @@ -52,6 +52,10 @@ on: type: boolean required: false default: false + ALLOW_GKE_VERSION_FALLBACK: + type: boolean + required: false + default: true secrets: GKE_ADMIN: required: true @@ -83,6 +87,7 @@ jobs: TEST_LATEST_RELEASE: ${{ inputs.TEST_LATEST_RELEASE }} TEST_TIMEOUT_MINUTES: ${{ inputs.TEST_TIMEOUT_MINUTES }} USE_MULTICLUSTER_OIDC_ENV: ${{ inputs.USE_MULTICLUSTER_OIDC_ENV }} + ALLOW_GKE_VERSION_FALLBACK: ${{ inputs.ALLOW_GKE_VERSION_FALLBACK }} steps: - uses: actions/checkout@v4 - run: | @@ -97,7 +102,7 @@ jobs: - name: Start GKE environment run: | set -euo pipefail - ./script/start-gke-env.sh "${ESCAPED_GKE_CLUSTER}" "${GKE_ZONE}" "${GKE_VERSION}" "${GKE_ADMIN}" > /dev/null + ./script/start-gke-env.sh "${ESCAPED_GKE_CLUSTER}" "${GKE_ZONE}" "${GKE_VERSION}" "${GKE_ADMIN}" "${GKE_RELEASE_CHANNEL} "${ALLOW_GKE_VERSION_FALLBACK}" > /dev/null - # TODO(castelblanque) Unify shared resources with kubeapps-local-dev-users-rbac.yaml that only applies to Kind clusters name: Apply customizations to GKE cluster run: | diff --git a/.github/workflows/kubeapps-general.yaml b/.github/workflows/kubeapps-general.yaml index 786ecc35dc0..8fe75fa769e 100644 --- a/.github/workflows/kubeapps-general.yaml +++ b/.github/workflows/kubeapps-general.yaml @@ -53,17 +53,17 @@ env: IMG_PLATFORMS: "linux/amd64" KAPP_CONTROLLER_VERSION: "v0.50.0" FLUX_VERSION: "v2.2.2" - K8S_KIND_VERSION: "v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72" KIND_VERSION: "v0.20.0" - KUBECTL_VERSION: "v1.27.9" MKCERT_VERSION: "v1.4.4" NODE_VERSION: "20.11.0" OLM_VERSION: "v0.26.0" POSTGRESQL_VERSION: "16.1.0-debian-11-r25" RUST_VERSION: "1.75.0" SEMVER_VERSION: "3.4.0" - GKE_STABLE_VERSION: "1.27.3" - GKE_REGULAR_VERSION: "1.27.3" + K8S_KIND_VERSION: "v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72" + KUBECTL_VERSION: "v1.27.9" + GKE_REGULAR_VERSION: "1.27.9" + GKE_STABLE_VERSION: "1.27.8" GKE_ZONE: "us-east1-c" GKE_PROJECT: "vmware-kubeapps-ci" GKE_CLUSTER: "kubeapps-test" diff --git a/script/start-gke-env.sh b/script/start-gke-env.sh index b344c6a1a31..5c872d9d0f5 100755 --- a/script/start-gke-env.sh +++ b/script/start-gke-env.sh @@ -11,6 +11,8 @@ CLUSTER=${1:?} ZONE=${2:?} GKE_VERSION=${3:?} ADMIN=${4:?} +GKE_RELEASE_CHANNEL=${5:?} +ALLOW_GKE_VERSION_FALLBACK=${6:?} DEBUG_MODE=${DEBUG_MODE:-"false"} [[ "${DEBUG_MODE}" == "true" ]] && set -x @@ -34,6 +36,31 @@ if [[ $(gcloud container clusters list --filter="name:${CLUSTER}") ]]; then fi fi +# Check if the version is allowed in the current channel +gcloud container get-server-config --location "${ZONE}" >list.yaml +for i in {0..2}; do + channel=$(yq .channels[$i].channel