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

Makefile

@@ -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)

test/e2e/data/e2e_conf.yaml

@@ -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.
@@ -11,21 +8,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