Use calico flavor for tests (#112)

Author: simcod

Makefile

@@ -137,15 +137,13 @@ E2E_FIREWALL_IMAGE ?= "firewall-ubuntu-3.0"
 E2E_FIREWALL_SIZE ?= "v1-small-x86"
 E2E_FIREWALL_NETWORKS ?= "internet-mini-lab"
 ARTIFACTS ?= "$(PWD)/_artifacts"
+E2E_DEFAULT_FLAVOR ?= "calico"
 # Can be something like: basic && !move
 E2E_LABEL_FILTER ?= ""
 
 .PHONY: test-e2e
 test-e2e: manifests generate fmt vet ginkgo
-	rm -rf $(ARTIFACTS)/config/target
-
-	mkdir -p $(ARTIFACTS)/config/target
-	kubectl kustomize test/e2e/frmwrk/config/target/base -o $(ARTIFACTS)/config/target/base.yaml
+	rm -rf $(ARTIFACTS)
 
 	@METAL_API_URL=$(E2E_METAL_API_URL) \
 	METAL_API_HMAC=$(E2E_METAL_API_HMAC) \
@@ -163,6 +161,7 @@ test-e2e: manifests generate fmt vet ginkgo
 	FIREWALL_SIZE=$(E2E_FIREWALL_SIZE) \
 	FIREWALL_NETWORKS=$(E2E_FIREWALL_NETWORKS) \
 	ARTIFACTS=$(ARTIFACTS) \
+	E2E_DEFAULT_FLAVOR=$(E2E_DEFAULT_FLAVOR) \
 	$(GINKGO) -vv -r --junit-report="junit.e2e_suite.xml" --output-dir="$(ARTIFACTS)" --label-filter="$(E2E_LABEL_FILTER)" -timeout 60m ./test/e2e/frmwrk
 
 .PHONY: lint

test/e2e/frmwrk/config/capi-e2e-config.yaml

@@ -99,6 +99,19 @@ providers:
   #     - old: --metrics-addr=127.0.0.1:8080
   #       new: --metrics-addr=:8080
 
+- name: helm
+  type: AddonProvider
+  versions:
+    - name: "{go://github.com/kubernetes-sigs/[email protected]}"
+      value: "https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/releases/download/{go://github.com/kubernetes-sigs/[email protected]}/addon-components.yaml"
+      type: "url"
+      contract: v1beta1
+      files:
+        - sourcePath: "../data/addon-helm/metadata.yaml"
+      replacements:
+        - old: --metrics-addr=127.0.0.1:8080
+          new: --metrics-addr=:8080
+
 - name: capms
   type: InfrastructureProvider
   versions:

test/e2e/frmwrk/config/target/base/cni-calico-installation.yaml

@@ -0,0 +1,20 @@
+# maps release series of major.minor to cluster-api contract version
+# the contract version may change between minor or major versions, but *not*
+# between patch versions.
+#
+# update this file only when a new major or minor version is released
+apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
+kind: Metadata
+releaseSeries:
+  - major: 0
+    minor: 1
+    contract: v1beta1
+  - major: 0
+    minor: 2
+    contract: v1beta1
+  - major: 0
+    minor: 3
+    contract: v1beta1
+  - major: 0
+    minor: 4
+    contract: v1beta1

test/e2e/frmwrk/config/target/base/kustomization.yaml

@@ -2,13 +2,10 @@ package frmwrk
 
 import (
 	"context"
-	"os"
-	"path"
 
 	. "github.com/onsi/ginkgo/v2" //nolint:staticcheck
 	. "github.com/onsi/gomega"    //nolint:staticcheck
 
-	"github.com/drone/envsubst/v2"
 	"sigs.k8s.io/cluster-api/test/framework"
 )
 
@@ -37,20 +34,6 @@ func createE2ECluster(ctx context.Context, e2eCtx *E2EContext, cfg ClusterConfig
 	})
 	Expect(controlPlane).To(Not(BeNil()))
 
-	By("Wait for CNI and CCM")
-	targetTemplate, err := os.ReadFile(path.Join(e2eCtx.Environment.artifactsPath, "config", "target", "base.yaml"))
-	Expect(err).ToNot(HaveOccurred())
-
-	vars := ec.Variables()
-	targetResources, err := envsubst.Eval(string(targetTemplate), func(varName string) string {
-		return vars[varName]
-	})
-	Expect(err).ToNot(HaveOccurred())
-
-	Eventually(func() error {
-		return ec.Refs.Workload.CreateOrUpdate(ctx, []byte(targetResources))
-	}, "10m", "15s").Should(Succeed()) // currently this long delay is required as machines might not be ready yet
-
 	By("Wait for kubeadm control plane")
 	framework.DiscoveryAndWaitForControlPlaneInitialized(ctx, framework.DiscoveryAndWaitForControlPlaneInitializedInput{
 		Lister:  e2eCtx.Environment.Bootstrap.GetClient(),

test/e2e/frmwrk/config/target/base/metal-ccm.yaml

@@ -309,6 +309,7 @@ func (e2e *E2ECluster) GenerateAndApplyClusterTemplate(ctx context.Context) {
 		ControlPlaneMachineCount: &e2e.ControlPlaneMachineCount,
 		WorkerMachineCount:       &e2e.WorkerMachineCount,
 		ClusterctlConfigPath:     e2e.E2EContext.Environment.ClusterctlConfigPath,
+		Flavor:                   e2e.E2EContext.Environment.Flavor,
 		// TODO: why does this not work with clusterctl.DefaultInfrastructureProvider?
 		InfrastructureProvider: "capms:v0.6.2",
 		LogFolder:              path.Join(e2e.E2EContext.Environment.artifactsPath, "clusters", e2e.ClusterName),