Merge pull request #2652 from sbueringer/pr-rename-e2e-image

🌱 Rename e2e-image
kubernetes-sigs · Jan 26, 2024 · ba8b131 · ba8b131
2 parents 0a7ee00 + a825163
commit ba8b131
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -516,7 +516,7 @@ test-integration: $(GINKGO) $(KUSTOMIZE) $(KIND)
 .PHONY: e2e-image
 e2e-image: ## Build the e2e manager image
 	docker buildx build --platform linux/$(ARCH) --output=type=docker \
-		--build-arg ldflags="$(LDFLAGS)" --tag="gcr.io/k8s-staging-cluster-api/capv-manager:e2e" .
+		--build-arg ldflags="$(LDFLAGS)" --tag="gcr.io/k8s-staging-capi-vsphere/cluster-api-vsphere-controller:dev" .
 
 .PHONY: e2e
 e2e: e2e-image generate-e2e-templates

diff --git a/hack/e2e.sh b/hack/e2e.sh
@@ -91,11 +91,11 @@ make envsubst
 # Save the docker image locally
 make e2e-image
 mkdir -p /tmp/images
-docker save gcr.io/k8s-staging-cluster-api/capv-manager:e2e -o "$DOCKER_IMAGE_TAR"
+docker save gcr.io/k8s-staging-capi-vsphere/cluster-api-vsphere-controller:dev -o "$DOCKER_IMAGE_TAR"
 
 # Store the image on gcs
 login
-E2E_IMAGE_SHA=$(docker inspect --format='{{index .Id}}' gcr.io/k8s-staging-cluster-api/capv-manager:e2e)
+E2E_IMAGE_SHA=$(docker inspect --format='{{index .Id}}' gcr.io/k8s-staging-capi-vsphere/cluster-api-vsphere-controller:dev)
 export E2E_IMAGE_SHA
 gsutil cp ${DOCKER_IMAGE_TAR} gs://capv-ci/"$E2E_IMAGE_SHA"
 

diff --git a/test/e2e/config/vsphere-ci.yaml b/test/e2e/config/vsphere-ci.yaml
@@ -14,7 +14,7 @@ images:
     loadBehavior: tryLoad
   - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.6.1
     loadBehavior: tryLoad
-  - name: gcr.io/k8s-staging-cluster-api/capv-manager:e2e
+  - name: gcr.io/k8s-staging-capi-vsphere/cluster-api-vsphere-controller:dev
     loadBehavior: mustLoad
   - name: quay.io/jetstack/cert-manager-cainjector:v1.12.2
     loadBehavior: tryLoad
@@ -106,7 +106,7 @@ providers:
         contract: v1beta1
         replacements:
           - old: gcr.io/k8s-staging-capi-vsphere/cluster-api-vsphere-controller:main
-            new: gcr.io/k8s-staging-cluster-api/capv-manager:e2e
+            new: gcr.io/k8s-staging-capi-vsphere/cluster-api-vsphere-controller:dev
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
         files:

diff --git a/test/e2e/config/vsphere-dev.yaml b/test/e2e/config/vsphere-dev.yaml
@@ -17,7 +17,7 @@ images:
     loadBehavior: tryLoad
   - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.6.1
     loadBehavior: tryLoad
-  - name: gcr.io/k8s-staging-cluster-api/capv-manager:e2e
+  - name: gcr.io/k8s-staging-capi-vsphere/cluster-api-vsphere-controller:dev
     loadBehavior: mustLoad
   - name: quay.io/jetstack/cert-manager-cainjector:v1.12.2
     loadBehavior: tryLoad
@@ -109,7 +109,7 @@ providers:
         contract: v1beta1
         replacements:
           - old: gcr.io/k8s-staging-capi-vsphere/cluster-api-vsphere-controller:main
-            new: gcr.io/k8s-staging-cluster-api/capv-manager:e2e
+            new: gcr.io/k8s-staging-capi-vsphere/cluster-api-vsphere-controller:dev
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
         files:

diff --git a/test/integration/integration-dev.yaml b/test/integration/integration-dev.yaml
@@ -17,7 +17,7 @@ images:
     loadBehavior: tryLoad
   - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.6.1
     loadBehavior: tryLoad
-  - name: gcr.io/k8s-staging-cluster-api/capv-manager:e2e
+  - name: gcr.io/k8s-staging-capi-vsphere/cluster-api-vsphere-controller:dev
     loadBehavior: mustLoad
   - name: quay.io/jetstack/cert-manager-cainjector:v1.12.2
     loadBehavior: tryLoad
@@ -80,7 +80,7 @@ providers:
           - sourcePath: "../e2e/data/shared/main/v1beta1_provider/metadata.yaml"
         replacements:
           - old: gcr.io/k8s-staging-capi-vsphere/cluster-api-vsphere-controller:main
-            new: gcr.io/k8s-staging-cluster-api/capv-manager:e2e
+            new: gcr.io/k8s-staging-capi-vsphere/cluster-api-vsphere-controller:dev
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
 variables: