🌱 Changes for community owned Prow CI (#3473)

* swap pod CIDR for CI

* test: adjust vsphere.yaml for new prow CI

* test: patch vm-operator for vc7 compatibility

* Makefile: generate both upstream and mirror-prow

* e2e: use generated ssh keypair

* make compatible to mirror-prow

* fix shellcheck

* hack: boskos naming

* e2e.sh fixup

* fixup

* vm-operator: fix platform in cross-built docker-images and rebuild

* fix ssh pubkey

* janitor: gcve compatibility

* e2e: drop VPN parts

* e2e: fixup janitor args

* fixup vcsim compatibility

* hack/tools/janitor/main.go drop old defaults

* shrink cidr for pods in CI

* Makefile: drop kubetest

Author: chrischdi

Makefile

@@ -232,7 +232,10 @@ VM_OPERATOR_DIR := test/infrastructure/vm-operator
 VM_OPERATOR_TMP_DIR ?= $(VM_OPERATOR_DIR)/vm-operator.tmp
 # note: this is the commit from 1.8.6 tag
 VM_OPERATOR_COMMIT ?= de75746a9505ef3161172d99b735d6593c54f0c5
+# sha256 sum diff of the applied patches on-top, it should match the output of `git diff | sha256`.
+VM_OPERATOR_DIFF ?= 65e87004a530fdf98ae636d6b3700db086a8f356066fb15996bd8f5abe9f236c
 VM_OPERATOR_VERSION ?= v1.8.6-0-gde75746a
+VM_OPERATOR_IMAGE_TAG ?= $(VM_OPERATOR_VERSION)-$(shell echo $(VM_OPERATOR_DIFF) | head -c 8)
 VM_OPERATOR_ALL_ARCH = amd64 arm64
 
 # net operator
@@ -284,6 +287,7 @@ NETOP_RBAC_ROOT ?= $(NETOP_DIR)/config/rbac
 TEST_EXTENSION_RBAC_ROOT ?= $(TEST_EXTENSION_DIR)/config/rbac
 
 JANITOR_DIR ?= ./$(TOOLS_DIR)/janitor
+JANITOR_ARGS ?= --resource-type=gcve-vsphere-project
 
 help:  # Display this help
 	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[0-9A-Za-z_-]+:.*?##/ { printf "  \033[36m%-50s\033[0m %s\n", $$1, $$2 } /^\$$\([0-9A-Za-z_-]+\):.*?##/ { gsub("_","-", $$1); printf "  \033[36m%-50s\033[0m %s\n", tolower(substr($$1, 3, length($$1)-7)), $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
@@ -448,18 +452,11 @@ generate-e2e-templates-v1.11: $(KUSTOMIZE)
 .PHONY: generate-test-infra-prowjobs
 generate-test-infra-prowjobs: $(PROWJOB_GEN) ## Generates the prowjob configurations in test-infra
 	@if [ -z "${TEST_INFRA_DIR}" ]; then echo "TEST_INFRA_DIR is not set"; exit 1; fi
-	mkdir -p "$(TEST_INFRA_DIR)/config/jobs/kubernetes-sigs/cluster-api-provider-vsphere/downstream"
 	$(PROWJOB_GEN) \
 		-config "$(TEST_INFRA_DIR)/config/jobs/kubernetes-sigs/cluster-api-provider-vsphere/cluster-api-provider-vsphere-prowjob-gen.yaml" \
 		-templates-dir "$(TEST_INFRA_DIR)/config/jobs/kubernetes-sigs/cluster-api-provider-vsphere/templates" \
-		-output-dir "$(TEST_INFRA_DIR)/config/jobs/kubernetes-sigs/cluster-api-provider-vsphere/downstream"
-	@for f in "$(TEST_INFRA_DIR)/config/jobs/kubernetes-sigs/cluster-api-provider-vsphere/downstream/"*periodics*; do \
-		cat "$${f}" | yq '.periodics |= map(select(.cluster != null))' > "$(TEST_INFRA_DIR)/config/jobs/kubernetes-sigs/cluster-api-provider-vsphere/$$(basename $${f})"; \
-		cat "$(TEST_INFRA_DIR)/config/jobs/kubernetes-sigs/cluster-api-provider-vsphere/$$(basename $${f})" | grep -q 'periodics: \[\]' && rm "$(TEST_INFRA_DIR)/config/jobs/kubernetes-sigs/cluster-api-provider-vsphere/$$(basename $${f})" || true; \
-	done
-	@for f in "$(TEST_INFRA_DIR)/config/jobs/kubernetes-sigs/cluster-api-provider-vsphere/downstream/"*presubmits*; do \
-		cat "$${f}" | yq '.presubmits."kubernetes-sigs/cluster-api-provider-vsphere" |= map(select(.cluster != null))' > "$(TEST_INFRA_DIR)/config/jobs/kubernetes-sigs/cluster-api-provider-vsphere/$$(basename $${f})";\
-	done
+		-output-dir "$(TEST_INFRA_DIR)/config/jobs/kubernetes-sigs/cluster-api-provider-vsphere"
+
 ## --------------------------------------
 ## Lint / Verify
 ## --------------------------------------
@@ -901,18 +898,23 @@ checkout-vm-operator:
 		git clone "https://github.com/vmware-tanzu/vm-operator.git" "$(VM_OPERATOR_TMP_DIR)"; \
 		cd "$(VM_OPERATOR_TMP_DIR)"; \
 		git checkout "$(VM_OPERATOR_COMMIT)"; \
+		git apply ../vm-operator-vc7-compat.diff; \
 	fi
 	@cd "$(ROOT_DIR)/$(VM_OPERATOR_TMP_DIR)"; \
-	if [ "$$(git describe --dirty 2> /dev/null)" != "$(VM_OPERATOR_VERSION)" ]; then \
-		echo "ERROR: checked out version $$(git describe --dirty 2> /dev/null) does not match expected version $(VM_OPERATOR_VERSION)"; \
+	if [ "$$(git describe 2> /dev/null)" != "$(VM_OPERATOR_VERSION)" ]; then \
+		echo "ERROR: checked out version $$(git describe 2> /dev/null) does not match expected version $(VM_OPERATOR_VERSION)"; \
+		exit 1; \
+	fi; \
+	if [ "$$(git diff | sha256)" != "$(VM_OPERATOR_DIFF)" ]; then \
+		echo "ERROR: existing git diff $$(git diff | sha256) does not match the expected diff $(VM_OPERATOR_DIFF)"; \
 		exit 1; \
 	fi
 
 .PHONY: generate-manifests-vm-operator
 generate-manifests-vm-operator: $(RELEASE_DIR) $(KUSTOMIZE) checkout-vm-operator ## Build the vm-operator manifest yaml file
 	kustomize build --load-restrictor LoadRestrictionsNone "$(VM_OPERATOR_TMP_DIR)/config/wcp" > "$(VM_OPERATOR_DIR)/config/vm-operator.yaml"
-	sed -i'' -e 's@image: vmoperator.*@image: '"$(VM_OPERATOR_CONTROLLER_IMG):$(VM_OPERATOR_VERSION)"'@' "$(VM_OPERATOR_DIR)/config/vm-operator.yaml"
-	kustomize build "$(VM_OPERATOR_DIR)/config" > "$(VM_OPERATOR_DIR)/vm-operator-$(VM_OPERATOR_VERSION).yaml"
+	sed -i'' -e 's@image: gcr.io/k8s-staging-capi-vsphere/extra/vm-operator.*@image: '"$(VM_OPERATOR_CONTROLLER_IMG):$(VM_OPERATOR_IMAGE_TAG)"'@' "$(VM_OPERATOR_DIR)/config/vm-operator-image-names.yaml"
+	kustomize build "$(VM_OPERATOR_DIR)/config" > "$(VM_OPERATOR_DIR)/vm-operator-$(VM_OPERATOR_IMAGE_TAG).yaml"
 
 .PHONY: docker-build-all-vm-operator
 docker-build-all-vm-operator: $(addprefix docker-vm-operator-build-,$(VM_OPERATOR_ALL_ARCH)) ## Build docker images for all architectures
@@ -924,7 +926,7 @@ docker-vm-operator-build-%:
 docker-build-vm-operator: checkout-vm-operator
 	@if [ -z "${VM_OPERATOR_VERSION}" ]; then echo "VM_OPERATOR_VERSION is not set"; exit 1; fi
 	cd $(VM_OPERATOR_TMP_DIR) && \
-	$(MAKE) IMAGE=$(VM_OPERATOR_CONTROLLER_IMG)-$(ARCH) IMAGE_TAG=$(VM_OPERATOR_VERSION) GOARCH=$(ARCH) docker-build
+	$(MAKE) IMAGE=$(VM_OPERATOR_CONTROLLER_IMG)-$(ARCH) IMAGE_TAG=$(VM_OPERATOR_IMAGE_TAG) GOARCH=$(ARCH) docker-build
 
 .PHONY: docker-push-all-vm-operator
 docker-push-all-vm-operator: $(addprefix docker-vm-operator-push-,$(VM_OPERATOR_ALL_ARCH))  ## Push the docker images to be included in the release for all architectures + related multiarch manifests
@@ -936,14 +938,14 @@ docker-vm-operator-push-%:
 .PHONY: docker-push-vm-operator
 docker-push-vm-operator:
 	@if [ -z "${VM_OPERATOR_VERSION}" ]; then echo "VM_OPERATOR_VERSION is not set"; exit 1; fi
-	docker push $(VM_OPERATOR_CONTROLLER_IMG)-$(ARCH):$(VM_OPERATOR_VERSION)
+	docker push $(VM_OPERATOR_CONTROLLER_IMG)-$(ARCH):$(VM_OPERATOR_IMAGE_TAG)
 
 .PHONY: docker-push-manifest-vm-operator
 docker-push-manifest-vm-operator:
 	@if [ -z "${VM_OPERATOR_VERSION}" ]; then echo "VM_OPERATOR_VERSION is not set"; exit 1; fi
-	docker manifest create --amend $(VM_OPERATOR_CONTROLLER_IMG):$(VM_OPERATOR_VERSION) $(shell echo $(VM_OPERATOR_ALL_ARCH) | sed -e "s~[^ ]*~$(VM_OPERATOR_CONTROLLER_IMG)\-&:$(VM_OPERATOR_VERSION)~g")
-	@for arch in $(VM_OPERATOR_ALL_ARCH); do docker manifest annotate --arch $${arch} ${VM_OPERATOR_CONTROLLER_IMG}:${VM_OPERATOR_VERSION} ${VM_OPERATOR_CONTROLLER_IMG}-$${arch}:${VM_OPERATOR_VERSION}; done
-	docker manifest push --purge $(VM_OPERATOR_CONTROLLER_IMG):$(VM_OPERATOR_VERSION)
+	docker manifest create --amend $(VM_OPERATOR_CONTROLLER_IMG):$(VM_OPERATOR_IMAGE_TAG) $(shell echo $(VM_OPERATOR_ALL_ARCH) | sed -e "s~[^ ]*~$(VM_OPERATOR_CONTROLLER_IMG)\-&:$(VM_OPERATOR_IMAGE_TAG)~g")
+	@for arch in $(VM_OPERATOR_ALL_ARCH); do docker manifest annotate --arch $${arch} ${VM_OPERATOR_CONTROLLER_IMG}:${VM_OPERATOR_IMAGE_TAG} ${VM_OPERATOR_CONTROLLER_IMG}-$${arch}:${VM_OPERATOR_IMAGE_TAG}; done
+	docker manifest push --purge $(VM_OPERATOR_CONTROLLER_IMG):$(VM_OPERATOR_IMAGE_TAG)
 
 .PHONY: clean-vm-operator
 clean-vm-operator:
@@ -979,7 +981,7 @@ clean-ci: ## Cleanup orphaned objects in CI
 	@if [ -z "${GOVC_URL}" ]; then echo "GOVC_URL is not set"; exit 1; fi
 	@if [ -z "${VSPHERE_TLS_THUMBPRINT}" ]; then echo "VSPHERE_TLS_THUMBPRINT is not set"; exit 1; fi
 	@if [ -z "${BOSKOS_HOST}" ]; then echo "BOSKOS_HOST is not set"; exit 1; fi
-	go run $(JANITOR_DIR) --dry-run=false
+	go run $(JANITOR_DIR) --dry-run=false $(JANITOR_ARGS)
 
 .PHONY: clean-temporary
 clean-temporary: ## Remove all temporary files and folders

hack/clean-ci.sh

@@ -18,41 +18,18 @@ set -o errexit  # exits immediately on any unexpected error (does not bypass tra
 set -o nounset  # will error if variables are used without first being defined
 set -o pipefail # any non-zero exit code in a piped command causes the pipeline to fail with that code
 
-export PATH=${PWD}/hack/tools/bin:${PATH}
-REPO_ROOT=$(git rev-parse --show-toplevel)
-
-# shellcheck source=./hack/ensure-kubectl.sh
-source "${REPO_ROOT}/hack/ensure-kubectl.sh"
-
-on_exit() {
-  # kill the VPN
-  docker kill vpn
-}
-
-trap on_exit EXIT
-
-# Run the vpn client in container
-docker run --rm -d --name vpn -v "${HOME}/.openvpn/:${HOME}/.openvpn/" \
-  -w "${HOME}/.openvpn/" --cap-add=NET_ADMIN --net=host --device=/dev/net/tun \
-  gcr.io/k8s-staging-capi-vsphere/extra/openvpn:latest
-
-# Tail the vpn logs
-docker logs vpn
-
-  # Wait until the VPN connection is active.
-function wait_for_vpn_up() {
-  local n=0
-  until [ $n -ge 30 ]; do
-    curl "https://${GOVC_URL}" --connect-timeout 2 -k && RET=$? || RET=$?
-    if [[ "$RET" -eq 0 ]]; then
-      break
-    fi
-    n=$((n + 1))
-    sleep 1
-  done
-  return "$RET"
-}
-wait_for_vpn_up
+# Fallback for mirror-prow.
+if [[ "${GOVC_URL:-}" == "10.2.224.4" ]]; then
+  export JANITOR_ARGS
+  JANITOR_ARGS="--resource-type=vsphere-project-cluster-api-provider --resource-type=vsphere-project-cloud-provider --resource-type=vsphere-project-image-builder"
+fi
+
+# Sanitize input envvars to not contain newline
+GOVC_USERNAME=$(echo "${GOVC_USERNAME}" | tr -d "\n")
+GOVC_PASSWORD=$(echo "${GOVC_PASSWORD}" | tr -d "\n")
+GOVC_URL=$(echo "${GOVC_URL}" | tr -d "\n")
+VSPHERE_TLS_THUMBPRINT=$(echo "${VSPHERE_TLS_THUMBPRINT}" | tr -d "\n")
+BOSKOS_HOST=$(echo "${BOSKOS_HOST}" | tr -d "\n")
 
 # Run e2e tests
 make clean-ci

hack/e2e.sh

@@ -43,7 +43,11 @@ export BOSKOS_RESOURCE_OWNER=cluster-api-provider-vsphere
 if [[ "${JOB_NAME}" != "" ]]; then
   export BOSKOS_RESOURCE_OWNER="${JOB_NAME}/${BUILD_ID}"
 fi
-export BOSKOS_RESOURCE_TYPE=vsphere-project-cluster-api-provider
+export BOSKOS_RESOURCE_TYPE="gcve-vsphere-project"
+# Fallback for mirror-prow.
+if [[ "${GOVC_URL:-}" == "10.2.224.4" ]]; then
+  BOSKOS_RESOURCE_TYPE=vsphere-project-cluster-api-provider
+fi
 
 on_exit() {
   # Only handle Boskos when we have to (not for vcsim)
@@ -55,11 +59,6 @@ on_exit() {
     [ -z "${BOSKOS_HOST:-}" ] || docker run -e VSPHERE_USERNAME -e VSPHERE_PASSWORD gcr.io/k8s-staging-capi-vsphere/extra/boskosctl:latest release --boskos-host="${BOSKOS_HOST}" --resource-owner="${BOSKOS_RESOURCE_OWNER}" --resource-name="${BOSKOS_RESOURCE_NAME}" --vsphere-server="${VSPHERE_SERVER}" --vsphere-tls-thumbprint="${VSPHERE_TLS_THUMBPRINT}" --vsphere-folder="${BOSKOS_RESOURCE_FOLDER}" --vsphere-resource-pool="${BOSKOS_RESOURCE_POOL}"
   fi
 
-  # kill the VPN only when we started it (not vcsim)
-  if [[ ! "${GINKGO_FOCUS:-}" =~ $RE_VCSIM ]]; then
-    docker kill vpn
-  fi
-
   # Cleanup VSPHERE_PASSWORD from temporary artifacts directory.
   if [[ "${ORIGINAL_ARTIFACTS}" != "" ]]; then
     # Delete non-text files from artifacts directory to not leak files accidentially
@@ -91,47 +90,43 @@ on_exit() {
 
 trap on_exit EXIT
 
-# NOTE: when running on CI without presets, value for variables are missing: GOVC_URL, GOVC_USERNAME, GOVC_PASSWORD, VM_SSH_PUB_KEY),
+# Sanitize input envvars to not contain newline
+GOVC_USERNAME=$(echo "${GOVC_USERNAME:-}" | tr -d "\n")
+GOVC_PASSWORD=$(echo "${GOVC_PASSWORD:-}" | tr -d "\n")
+GOVC_URL=$(echo "${GOVC_URL:-}" | tr -d "\n")
+VSPHERE_TLS_THUMBPRINT=$(echo "${VSPHERE_TLS_THUMBPRINT:-}" | tr -d "\n")
+BOSKOS_HOST=$(echo "${BOSKOS_HOST:-}" | tr -d "\n")
+
+# NOTE: when running on CI without presets, value for variables are missing: GOVC_URL, GOVC_USERNAME, GOVC_PASSWORD),
 #  but this is not an issue when we are targeting vcsim (corresponding VSPHERE_ variables will be injected during test setup).
 export VSPHERE_SERVER="${GOVC_URL:-}"
 export VSPHERE_USERNAME="${GOVC_USERNAME:-}"
 export VSPHERE_PASSWORD="${GOVC_PASSWORD:-}"
-export VSPHERE_SSH_AUTHORIZED_KEY="${VM_SSH_PUB_KEY:-}"
-export VSPHERE_SSH_PRIVATE_KEY="/root/ssh/.private-key/private-key"
 export E2E_CONF_FILE="${REPO_ROOT}/test/e2e/config/vsphere.yaml"
 export E2E_CONF_OVERRIDE_FILE=""
-export E2E_VM_OPERATOR_VERSION="${VM_OPERATOR_VERSION:-v1.8.6-0-gde75746a}"
+export E2E_VM_OPERATOR_VERSION="${VM_OPERATOR_VERSION:-v1.8.6-0-gde75746a-65e87004}"
 export DOCKER_IMAGE_TAR="/tmp/images/image.tar"
 export GC_KIND="false"
 
+SSH_KEY_DIR=$(mktemp -d)
+export VSPHERE_SSH_PRIVATE_KEY
+VSPHERE_SSH_PRIVATE_KEY="${SSH_KEY_DIR}/ssh-key"
+ssh-keygen -t ed25519 -f "${VSPHERE_SSH_PRIVATE_KEY}" -N ""
+export VSPHERE_SSH_AUTHORIZED_KEY
+VSPHERE_SSH_AUTHORIZED_KEY="$(cat "${VSPHERE_SSH_PRIVATE_KEY}.pub")"
+
+# Fallback for mirror-prow.
+if [[ "${GOVC_URL:-}" == "10.2.224.4" ]]; then
+  VSPHERE_SSH_AUTHORIZED_KEY="${VM_SSH_PUB_KEY:-}"
+  VSPHERE_SSH_PRIVATE_KEY="/root/ssh/.private-key/private-key"
+  E2E_CONF_OVERRIDE_FILE="$(pwd)/test/e2e/config/config-overrides-mirror-prow.yaml"
+fi
+
 # Make tests run in-parallel
 export GINKGO_NODES=5
 
-# Only run the vpn/check for IPAM when we need them (not for vcsim)
+# Only run the boskos/check for IPAM when we need them (not for vcsim)
 if [[ ! "${GINKGO_FOCUS:-}" =~ $RE_VCSIM ]]; then
-  # Run the vpn client in container
-  docker run --rm -d --name vpn -v "${HOME}/.openvpn/:${HOME}/.openvpn/" \
-    -w "${HOME}/.openvpn/" --cap-add=NET_ADMIN --net=host --device=/dev/net/tun \
-    gcr.io/k8s-staging-capi-vsphere/extra/openvpn:latest
-
-  # Tail the vpn logs
-  docker logs vpn
-
-  # Wait until the VPN connection is active.
-  function wait_for_vpn_up() {
-    local n=0
-    until [ $n -ge 30 ]; do
-      curl "https://${VSPHERE_SERVER}" --connect-timeout 2 -k && RET=$? || RET=$?
-      if [[ "$RET" -eq 0 ]]; then
-        break
-      fi
-      n=$((n + 1))
-      sleep 1
-    done
-    return "$RET"
-  }
-  wait_for_vpn_up
-
   # If BOSKOS_HOST is set then acquire a vsphere-project from Boskos.
   if [ -n "${BOSKOS_HOST:-}" ]; then
     # Check out the account from Boskos and store the produced environment

hack/tools/janitor/main.go

@@ -43,8 +43,8 @@ var (
 func initFlags(fs *pflag.FlagSet) {
 	// Note: Intentionally not adding a fallback value, so it is still possible to not use Boskos.
 	fs.StringVar(&boskosHost, "boskos-host", os.Getenv("BOSKOS_HOST"), "Boskos server URL. Boskos is only used to retrieve resources if this flag is set.")
-	fs.StringVar(&resourceOwner, "resource-owner", "vsphere-janitor", "Owner for the resource during cleanup.")
-	fs.StringArrayVar(&resourceTypes, "resource-type", []string{"vsphere-project-cluster-api-provider", "vsphere-project-cloud-provider", "vsphere-project-image-builder"}, "Types of the resources")
+	fs.StringVar(&resourceOwner, "resource-owner", "gcve-janitor", "Owner for the resource during cleanup.")
+	fs.StringArrayVar(&resourceTypes, "resource-type", []string{"gcve-vsphere-project"}, "Types of the resources")
 	fs.BoolVar(&dryRun, "dry-run", false, "dry-run results in not deleting anything but printing the actions.")
 }
 

test/e2e/config/config-overrides-mirror-prow.yaml

@@ -0,0 +1,15 @@
+---
+# This e2e config file contains an example of overrides for a tests targeting a user provided vCenter instance.
+# Those overrides will be applied on top of the content of the config file used for CI (only variables and intervals are considered)
+
+variables:
+  VSPHERE_COMPUTE_CLUSTER: "Cluster-1"
+  VSPHERE_DATACENTER:  "SDDC-Datacenter"
+  VSPHERE_FOLDER: "/SDDC-Datacenter/vm/Workloads/cluster-api-provider-vsphere"
+  VSPHERE_RESOURCE_POOL: "/SDDC-Datacenter/host/Cluster-1/Resources/Compute-ResourcePool/cluster-api-provider-vsphere"
+  VSPHERE_DATASTORE: "WorkloadDatastore"
+  VSPHERE_STORAGE_POLICY: "Cluster API vSphere Storage Policy"
+  VSPHERE_NETWORK: "sddc-cgw-network-10"
+  VSPHERE_DISTRIBUTED_PORT_GROUP: "/SDDC-Datacenter/network/sddc-cgw-network-10"
+
+intervals:

test/e2e/config/vsphere.yaml

@@ -18,7 +18,7 @@ images:
     loadBehavior: mustLoad
   - name: gcr.io/k8s-staging-capi-vsphere/cluster-api-vsphere-test-extension-{ARCH}:dev
     loadBehavior: mustLoad
-  - name: gcr.io/k8s-staging-capi-vsphere/extra/vm-operator:v1.8.6-0-gde75746a
+  - name: gcr.io/k8s-staging-capi-vsphere/extra/vm-operator:v1.8.6-0-gde75746a-65e87004
     loadBehavior: tryLoad
 
 providers:
@@ -237,9 +237,9 @@ providers:
   - name: vm-operator
     type: RuntimeExtensionProvider # vm-operator isn't a provider, but we fake it is so it can be handled by the clusterctl machinery.
     versions:
-      - name: v1.8.6-0-gde75746a
+      - name: v1.8.6-0-gde75746a-65e87004
         # Use manifest from source files
-        value: "file://../../../../cluster-api-provider-vsphere/test/infrastructure/vm-operator/vm-operator-v1.8.6-0-gde75746a.yaml"
+        value: "file://../../../../cluster-api-provider-vsphere/test/infrastructure/vm-operator/vm-operator-v1.8.6-0-gde75746a-65e87004.yaml"
         type: "url"
         contract: v1beta1
         files:
@@ -289,12 +289,12 @@ variables:
   WORKER_MACHINE_COUNT: 1
   IP_FAMILY: "IPv4"
   CLUSTER_CLASS_NAME: "quick-start"
-  VSPHERE_COMPUTE_CLUSTER: "Cluster-1"
-  VSPHERE_DATACENTER:  "SDDC-Datacenter"
-  VSPHERE_FOLDER: "/SDDC-Datacenter/vm/Workloads/cluster-api-provider-vsphere"
-  VSPHERE_RESOURCE_POOL: "/SDDC-Datacenter/host/Cluster-1/Resources/Compute-ResourcePool/cluster-api-provider-vsphere"
-  VSPHERE_DATASTORE: "WorkloadDatastore"
-  VSPHERE_STORAGE_POLICY: "Cluster API vSphere Storage Policy"
+  VSPHERE_COMPUTE_CLUSTER: "k8s-gcve-cluster"
+  VSPHERE_DATACENTER:  "Datacenter"
+  VSPHERE_FOLDER: "/Datacenter/vm/Workloads/prow"
+  VSPHERE_RESOURCE_POOL: "/Datacenter/host/k8s-gcve-cluster/Resources/prow"
+  VSPHERE_DATASTORE: "vsanDatastore"
+  VSPHERE_STORAGE_POLICY: "vSAN Default Storage Policy"
   VSPHERE_STORAGE_CLASS: "test-storageclass"
   VSPHERE_MACHINE_CLASS_NAME: "test-machine-class"
   # CI runs vm-operator v1.8.6 on vCenter 8, setting CPU and Memory does not work and defaults to 2 CPUs / 2Gi memory.
@@ -309,8 +309,8 @@ variables:
   VSPHERE_CONTENT_LIBRARY: "capv"
   VSPHERE_CONTENT_LIBRARY_ITEMS: "ubuntu-2204-kube-v1.28.0,ubuntu-2204-kube-v1.29.0,ubuntu-2204-kube-v1.30.0,ubuntu-2404-kube-v1.31.0,ubuntu-2404-kube-v1.32.0,ubuntu-2404-kube-v1.33.0"
   VSPHERE_IMAGE_NAME: "ubuntu-2404-kube-v1.33.0"
-  VSPHERE_NETWORK: "sddc-cgw-network-10"
-  VSPHERE_DISTRIBUTED_PORT_GROUP: "/SDDC-Datacenter/network/sddc-cgw-network-10"
+  VSPHERE_NETWORK: "k8s-ci"
+  VSPHERE_DISTRIBUTED_PORT_GROUP: "/Datacenter/network/k8s-ci"
   VSPHERE_TEMPLATE: "ubuntu-2404-kube-v1.33.0"
   FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-4152.2.2-kube-v1.33.0"
   KUBETEST_CONFIGURATION: "./data/kubetest/conformance.yaml"

test/e2e/data/infrastructure-vsphere-govmomi/main/commons/cluster-network-CIDR.yaml

@@ -7,4 +7,4 @@ spec:
   clusterNetwork:
     pods:
       cidrBlocks:
-        - 192.168.30.0/24
+        - 192.168.128.0/24

test/e2e/data/infrastructure-vsphere-govmomi/v1.11/commons/cluster-network-CIDR.yaml

@@ -7,4 +7,4 @@ spec:
   clusterNetwork:
     pods:
       cidrBlocks:
-        - 192.168.30.0/24
+        - 192.168.128.0/24

test/e2e/data/infrastructure-vsphere-govmomi/v1.12/commons/cluster-network-CIDR.yaml

@@ -7,4 +7,4 @@ spec:
   clusterNetwork:
     pods:
       cidrBlocks:
-        - 192.168.30.0/24
+        - 192.168.128.0/24

test/e2e/data/infrastructure-vsphere-govmomi/v1.13/commons/cluster-network-CIDR.yaml

@@ -7,4 +7,4 @@ spec:
   clusterNetwork:
     pods:
       cidrBlocks:
-        - 192.168.30.0/24
+        - 192.168.128.0/24