🌱 hack: try to pull from gcr.io/k8s-staging-capi-vsphere/extra/ instead of docker hub (#3408)

* hack: try to pull from gcr.io/k8s-staging-capi-vsphere/extra/ instead of docker hub

* separate management latest ci and latest ci versions

* fix

* review fixes

* fix

---------

Co-authored-by: Stefan Bueringer <[email protected]>

Author: chrischdi

hack/ci-e2e-lib.sh

@@ -30,16 +30,16 @@ k8s::prepareKindestImagesVariables() {
   # Ensure kind image get's built full e2e tests.
   if [[ "${GINKGO_SKIP:-}" == "\\[Conformance\\] \\[specialized-infra\\]" ]]; then
     if [[ "${GINKGO_FOCUS:-}" == "\\[supervisor\\]" ]] || [[ "${GINKGO_FOCUS:-}" == "" ]]; then
-      KUBERNETES_VERSION_LATEST_CI=$(grep KUBERNETES_VERSION_LATEST_CI: < "$E2E_CONF_FILE" | awk -F'"' '{ print $2}')
-      echo "Defaulting KUBERNETES_VERSION_LATEST_CI to ${KUBERNETES_VERSION_LATEST_CI} to trigger image build (because env var is not set)"
+      KUBERNETES_VERSION_MANAGEMENT_LATEST_CI=$(grep KUBERNETES_VERSION_MANAGEMENT_LATEST_CI: < "$E2E_CONF_FILE" | awk -F'"' '{ print $2}')
+      echo "Defaulting KUBERNETES_VERSION_MANAGEMENT_LATEST_CI to ${KUBERNETES_VERSION_MANAGEMENT_LATEST_CI} to trigger image build (because env var is not set)"
     fi
   fi
 
   # Ensure kind image get's built vcsim e2e tests.
   if [[ -z "${GINKGO_SKIP:-}" ]]; then
     if [[ "${GINKGO_FOCUS:-}" == "\\[vcsim\\]" ]] || [[ "${GINKGO_FOCUS:-}" == "\\[vcsim\\] \\[supervisor\\]" ]]; then
-      KUBERNETES_VERSION_LATEST_CI=$(grep KUBERNETES_VERSION_LATEST_CI: < "$E2E_CONF_FILE" | awk -F'"' '{ print $2}')
-      echo "Defaulting KUBERNETES_VERSION_LATEST_CI to ${KUBERNETES_VERSION_LATEST_CI} to trigger image build (because env var is not set)"
+      KUBERNETES_VERSION_MANAGEMENT_LATEST_CI=$(grep KUBERNETES_VERSION_MANAGEMENT_LATEST_CI: < "$E2E_CONF_FILE" | awk -F'"' '{ print $2}')
+      echo "Defaulting KUBERNETES_VERSION_MANAGEMENT_LATEST_CI to ${KUBERNETES_VERSION_MANAGEMENT_LATEST_CI} to trigger image build (because env var is not set)"
     fi
   fi
 }
@@ -54,9 +54,9 @@ k8s::prepareKindestImages() {
     kind::prepareKindestImage "$resolveVersion"
   fi
 
-  if [ -n "${KUBERNETES_VERSION_LATEST_CI:-}" ]; then
-    k8s::resolveVersion "KUBERNETES_VERSION_LATEST_CI" "$KUBERNETES_VERSION_LATEST_CI"
-    export KUBERNETES_VERSION_LATEST_CI=$resolveVersion
+  if [ -n "${KUBERNETES_VERSION_MANAGEMENT_LATEST_CI:-}" ]; then
+    k8s::resolveVersion "KUBERNETES_VERSION_MANAGEMENT_LATEST_CI" "$KUBERNETES_VERSION_MANAGEMENT_LATEST_CI"
+    export KUBERNETES_VERSION_MANAGEMENT_LATEST_CI=$resolveVersion
 
     kind::prepareKindestImage "$resolveVersion"
   fi
@@ -197,10 +197,14 @@ EOL
 kind::prepullImage () {
   local image=$1
   image="${image//+/_}"
+  mirrored_image="gcr.io/k8s-staging-capi-vsphere/extra/${image}"
 
   retVal=0
   if [[ "$(docker images -q "$image" 2> /dev/null)" == "" ]]; then
-    echo "+ Pulling $image"
+    echo "+ Trying to pull $image from mirror first"
+    docker pull "$mirrored_image" && docker tag "$mirrored_image" "$image" && return
+
+    echo "+ Falling pack to pull from original registry $image"
     docker pull "$image" || retVal=$?
   else
     echo "+ image $image already present in the system, skipping pre-pull"

test/e2e/clusterctl_upgrade_test.go

@@ -54,7 +54,7 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.12
 			capvVersion := "1.12"
 			capvStableRelease, err := getStableReleaseOfMinor(ctx, capvReleaseMarkerPrefix, capvVersion)
 			Expect(err).ToNot(HaveOccurred(), "Failed to get stable version for minor release : %s", capvVersion)
-			initKubernetesVersion, err := kubernetesversions.ResolveVersion(ctx, e2eConfig.MustGetVariable("KUBERNETES_VERSION_LATEST_CI"))
+			initKubernetesVersion, err := kubernetesversions.ResolveVersion(ctx, e2eConfig.MustGetVariable("KUBERNETES_VERSION_MANAGEMENT_LATEST_CI"))
 			Expect(err).ToNot(HaveOccurred())
 			return capi_e2e.ClusterctlUpgradeSpecInput{
 				E2EConfig:                         e2eConfig,

test/e2e/config/vsphere.yaml

@@ -304,6 +304,8 @@ providers:
 variables:
   # Ensure all Kubernetes versions used here are covered in patch-vsphere-template.yaml
   KUBERNETES_VERSION_MANAGEMENT: "v1.33.0-beta.0"
+  # Note: currently not ci/latest-1.33 because of rate-limiting issues.
+  KUBERNETES_VERSION_MANAGEMENT_LATEST_CI: "v1.33.0-beta.0"
   KUBERNETES_VERSION: "v1.33.0-beta.0"
   KUBERNETES_VERSION_UPGRADE_FROM: "v1.32.0"
   KUBERNETES_VERSION_UPGRADE_TO: "v1.33.0-beta.0"