test: build upgrade flavor

Author: vknabel

.gitignore

@@ -6,7 +6,7 @@
 *.dylib
 bin/*
 test/external-crds
-test/e2e/frmwrk/artifacts
+test/e2e/frmwrk/data/clusterctl-templates/cluster-template-*.yaml
 _artifacts
 Dockerfile.cross
 .release

Makefile

@@ -141,10 +141,13 @@ E2E_DEFAULT_FLAVOR ?= "calico"
 # Can be something like: basic && !move
 E2E_LABEL_FILTER ?= ""
 
+E2E_TEMPLATES := test/e2e/frmwrk/data/clusterctl-templates
 .PHONY: test-e2e
 test-e2e: manifests generate fmt vet ginkgo
 	rm -rf $(ARTIFACTS)
 
+	$(KUSTOMIZE) build $(E2E_TEMPLATES)/upgrade --load-restrictor LoadRestrictionsNone > $(E2E_TEMPLATES)/cluster-template-upgrade.yaml
+	
 	@METAL_API_URL=$(E2E_METAL_API_URL) \
 	METAL_API_HMAC=$(E2E_METAL_API_HMAC) \
 	METAL_API_HMAC_AUTH_TYPE=$(E2E_METAL_API_HMAC_AUTH_TYPE) \

test/e2e/frmwrk/cluster_upgrade_kubernetes_test.go

@@ -40,7 +40,7 @@ var _ = Describe("Upgrade Kubernetes Cluster Version", Ordered, Label("upgrade")
 			ControlPlaneMachineImage: e2eCtx.envOrVar("E2E_CONTROL_PLANE_MACHINE_IMAGE_PREFIX") + fromKubernetesVersion,
 			ControlPlaneMachineCount: 1,
 			WorkerMachineImage:       e2eCtx.envOrVar("E2E_WORKER_MACHINE_IMAGE_PREFIX") + fromKubernetesVersion,
-			WorkerMachineCount:       1,
+			WorkerMachineCount:       0,
 		})
 		ec.SetupMetalStackPreconditions(ctx)
 		ec.SetupNamespace(ctx)
@@ -66,8 +66,8 @@ var _ = Describe("Upgrade Kubernetes Cluster Version", Ordered, Label("upgrade")
 			SkipCleanup:              false,
 			SkipConformanceTests:     true,
 			ControlPlaneMachineCount: ptr.To[int64](1),
-			WorkerMachineCount:       ptr.To[int64](1),
-			Flavor:                   ptr.To(e2eCtx.Environment.Flavor),
+			WorkerMachineCount:       ptr.To[int64](0),
+			Flavor:                   ptr.To("upgrade"),
 		}
 	})
 

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

@@ -124,8 +124,7 @@ providers:
       - sourcePath: "../../../../config/clusterctl-templates/cluster-template.yaml"
       - sourcePath: "../../../../config/clusterctl-templates/cluster-template-calico.yaml"
       - sourcePath: "../../../../config/clusterctl-templates/cluster-template-pre-v1.33.yaml"
-      - sourcePath: "../../../../config/clusterctl-templates/cluster-template-mt-control-plane-upgrade-to.yaml"
-      - sourcePath: "../../../../config/clusterctl-templates/cluster-template-mt-worker-upgrade-to.yaml"
+      - sourcePath: "../data/clusterctl-templates/cluster-template-upgrade.yaml"
     replacements:
       - old: --metrics-addr=127.0.0.1:8080
         new: --metrics-addr=:8080

…emplate-mt-control-plane-upgrade-to.yaml …emplate-mt-control-plane-upgrade-to.yamlconfig/clusterctl-templates/cluster-template-mt-control-plane-upgrade-to.yaml renamed to test/e2e/frmwrk/data/clusterctl-templates/bases/cluster-template-mt-control-plane-upgrade-to.yaml config/clusterctl-templates/cluster-template-mt-control-plane-upgrade-to.yaml renamed to test/e2e/frmwrk/data/clusterctl-templates/bases/cluster-template-mt-control-plane-upgrade-to.yaml

@@ -2,6 +2,7 @@ apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
 kind: MetalStackMachineTemplate
 metadata:
   name: k8s-upgrade-worker
+  namespace: ${NAMESPACE}
 spec:
   template:
     spec:

…uster-template-mt-worker-upgrade-to.yaml …uster-template-mt-worker-upgrade-to.yamlconfig/clusterctl-templates/cluster-template-mt-worker-upgrade-to.yaml renamed to test/e2e/frmwrk/data/clusterctl-templates/bases/cluster-template-mt-worker-upgrade-to.yaml config/clusterctl-templates/cluster-template-mt-worker-upgrade-to.yaml renamed to test/e2e/frmwrk/data/clusterctl-templates/bases/cluster-template-mt-worker-upgrade-to.yaml

@@ -0,0 +1,4 @@
+resources:
+  - ../../../../../../config/clusterctl-templates/cluster-template-calico.yaml
+  - ../bases/cluster-template-mt-control-plane-upgrade-to.yaml
+  - ../bases/cluster-template-mt-worker-upgrade-to.yaml