Skip to content

🌱 E2E: Use CAPI production images and skip cert-manager pre-pull #2295

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

Merged
merged 1 commit into from
Dec 2, 2024
Merged

🌱 E2E: Use CAPI production images and skip cert-manager pre-pull #2295

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
9 changes: 3 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,12 +209,9 @@ e2e-image: docker-build

# Pull all the images references in test/e2e/data/e2e_conf.yaml
test-e2e-image-prerequisites:
docker pull gcr.io/k8s-staging-cluster-api/cluster-api-controller:v1.6.0
docker pull gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v1.6.0
docker pull gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v1.6.0
docker pull quay.io/jetstack/cert-manager-cainjector:v1.12.1
docker pull quay.io/jetstack/cert-manager-webhook:v1.12.1
docker pull quay.io/jetstack/cert-manager-controller:v1.12.1
docker pull registry.k8s.io/cluster-api/cluster-api-controller:v1.8.5
docker pull registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.8.5
docker pull registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.8.5

CONFORMANCE_E2E_ARGS ?= -kubetest.config-file=$(KUBETEST_CONF_PATH)
CONFORMANCE_E2E_ARGS += $(E2E_ARGS)
Expand Down
15 changes: 3 additions & 12 deletions test/e2e/data/e2e_conf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
---
# E2E test scenario using local dev images and manifests built from the source tree for following providers:
# - cluster-api
# - bootstrap kubeadm
# - control-plane kubeadm
# - openstack

# To run tests, run the following from the root of this repository.
Expand All @@ -12,21 +9,15 @@
managementClusterName: capo-e2e

images:
- name: gcr.io/k8s-staging-cluster-api/cluster-api-controller:v1.8.5
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.8.5
loadBehavior: tryLoad
- name: gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v1.8.5
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.8.5
loadBehavior: tryLoad
- name: gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v1.8.5
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.8.5
loadBehavior: tryLoad
# Use local dev images built source tree;
- name: gcr.io/k8s-staging-capi-openstack/capi-openstack-controller:e2e
loadBehavior: mustLoad
- name: quay.io/jetstack/cert-manager-cainjector:v1.14.5
loadBehavior: tryLoad
- name: quay.io/jetstack/cert-manager-webhook:v1.14.5
loadBehavior: tryLoad
- name: quay.io/jetstack/cert-manager-controller:v1.14.5
loadBehavior: tryLoad

providers:
- name: cluster-api
Expand Down