Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🌱 Rename e2e-image #2652

Merged
merged 1 commit into from
Jan 26, 2024
Merged

🌱 Rename e2e-image #2652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions hack/e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,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"

Expand Down
4 changes: 2 additions & 2 deletions test/e2e/config/vsphere-ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/config/vsphere-dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions test/integration/integration-dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
Loading