Merge pull request #2831 from Nordix/lentzi90/cleanup-upgrade-image-patch

🌱 E2E: Cleanup upgrade patches

Author: k8s-ci-robot

test/e2e/data/kustomize/components/upgrade-patches/ci-hack-kcp.yaml renamed to test/e2e/data/kustomize/components/self-hosted/ci-hack-kcp.yaml

@@ -0,0 +1,17 @@
+# Modifications to release templates for self-hosted scenarios.
+# This patch allows the nodes dowload the CAPO image from E2E_IMAGE_URL,
+# and load it. It is useful when testing unpublished images (e.g. a PR).
+# The image is downloaded only if DOWNLOAD_E2E_IMAGE is set to true
+# when rendering the cluster template.
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+patches:
+- path: ci-hack-kcp.yaml
+  target:
+    kind: KubeadmControlPlane
+    name: \${CLUSTER_NAME}-control-plane
+- path: ci-hack-kct.yaml
+  target:
+    kind: KubeadmConfigTemplate
+    name: \${CLUSTER_NAME}-md-0

test/e2e/data/kustomize/components/upgrade-patches/ci-hack-kct.yaml renamed to test/e2e/data/kustomize/components/self-hosted/ci-hack-kct.yaml

@@ -7,4 +7,4 @@ resources:
 components:
 - ../components/cluster-resource-sets
 - ../components/common
-- ../components/upgrade-patches
+- ../components/self-hosted

test/e2e/data/kustomize/components/self-hosted/kustomization.yaml

@@ -40,7 +40,6 @@ var (
 
 var _ = Describe("When testing clusterctl upgrades for CAPO (v0.11=>current) and ORC (v1.0.2=>current) [clusterctl-upgrade]", func() {
 	BeforeEach(func(ctx context.Context) {
-		setDownloadE2EImageEnvVar()
 		// Note: This gives the version without the 'v' prefix, so we need to add it below.
 		capoRelease011, err = clusterctl.ResolveRelease(ctx, "go://github.com/kubernetes-sigs/cluster-api-provider-openstack@v0.11")
 		Expect(err).ToNot(HaveOccurred(), "failed to get stable release of CAPO")
@@ -75,7 +74,6 @@ var _ = Describe("When testing clusterctl upgrades for CAPO (v0.11=>current) and
 
 var _ = Describe("When testing clusterctl upgrades for CAPO (v0.12=>current) and ORC (v1.0.2=>current)[clusterctl-upgrade]", func() {
 	BeforeEach(func(ctx context.Context) {
-		setDownloadE2EImageEnvVar()
 		// Note: This gives the version without the 'v' prefix, so we need to add it below.
 		capoRelease012, err = clusterctl.ResolveRelease(ctx, "go://github.com/kubernetes-sigs/cluster-api-provider-openstack@v0.12")
 		Expect(err).ToNot(HaveOccurred(), "failed to get stable release of CAPO")
@@ -110,7 +108,6 @@ var _ = Describe("When testing clusterctl upgrades for CAPO (v0.12=>current) and
 
 var _ = Describe("When testing clusterctl upgrades for CAPO (v0.13=>current) and ORC (v1.0.2=>current)[clusterctl-upgrade]", func() {
 	BeforeEach(func(ctx context.Context) {
-		setDownloadE2EImageEnvVar()
 		// Note: This gives the version without the 'v' prefix, so we need to add it below.
 		capoRelease013, err = clusterctl.ResolveRelease(ctx, "go://github.com/kubernetes-sigs/cluster-api-provider-openstack@v0.13")
 		Expect(err).ToNot(HaveOccurred(), "failed to get stable release of CAPO")

test/e2e/data/kustomize/components/upgrade-patches/kustomization.yaml

@@ -30,6 +30,8 @@ import (
 
 var _ = Describe("When testing Cluster API provider Openstack working on [self-hosted] clusters", func() {
 	BeforeEach(func() {
+		// The self-hosted cluster does not have the CAPO image loaded like the kind cluster does,
+		// so we download it from E2E_IMAGE_URL.
 		setDownloadE2EImageEnvVar()
 	})