Skip to content

Commit 29cf01a

Browse files
authored
Merge pull request #2300 from k8s-infra-cherrypick-robot/cherry-pick-2295-to-release-0.11
[release-0.11] 🌱 E2E: Use CAPI production images and skip cert-manager pre-pull
2 parents 0db62eb + fd02389 commit 29cf01a

File tree

2 files changed

+6
-18
lines changed

2 files changed

+6
-18
lines changed

Makefile

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -209,12 +209,9 @@ e2e-image: docker-build
209209

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

219216
CONFORMANCE_E2E_ARGS ?= -kubetest.config-file=$(KUBETEST_CONF_PATH)
220217
CONFORMANCE_E2E_ARGS += $(E2E_ARGS)

test/e2e/data/e2e_conf.yaml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
---
22
# E2E test scenario using local dev images and manifests built from the source tree for following providers:
3-
# - cluster-api
4-
# - bootstrap kubeadm
5-
# - control-plane kubeadm
63
# - openstack
74

85
# To run tests, run the following from the root of this repository.
@@ -11,21 +8,15 @@
118
managementClusterName: capo-e2e
129

1310
images:
14-
- name: gcr.io/k8s-staging-cluster-api/cluster-api-controller:v1.8.5
11+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.8.5
1512
loadBehavior: tryLoad
16-
- name: gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v1.8.5
13+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.8.5
1714
loadBehavior: tryLoad
18-
- name: gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v1.8.5
15+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.8.5
1916
loadBehavior: tryLoad
2017
# Use local dev images built source tree;
2118
- name: gcr.io/k8s-staging-capi-openstack/capi-openstack-controller:e2e
2219
loadBehavior: mustLoad
23-
- name: quay.io/jetstack/cert-manager-cainjector:v1.14.5
24-
loadBehavior: tryLoad
25-
- name: quay.io/jetstack/cert-manager-webhook:v1.14.5
26-
loadBehavior: tryLoad
27-
- name: quay.io/jetstack/cert-manager-controller:v1.14.5
28-
loadBehavior: tryLoad
2920

3021
providers:
3122
- name: cluster-api

0 commit comments

Comments
 (0)