Merge remote-tracking branch 'origin/main' into capi-v1.11.2

Author: simcod

Makefile

@@ -125,7 +125,7 @@ ARTIFACTS ?= "$(PWD)/_artifacts"
 
 .PHONY: test-e2e
 test-e2e: manifests generate fmt vet ginkgo
-	rm -rf test/e2e/frmwrk/artifacts
+	rm -rf $(ARTIFACTS)/config/target
 
 	mkdir -p $(ARTIFACTS)/config/target
 	kubectl kustomize test/e2e/frmwrk/config/target/base -o $(ARTIFACTS)/config/target/base.yaml

test/e2e/frmwrk/shared.go

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