Merge pull request #7172 from sbueringer/pr-e2e-test-drop-cgroupfs

🌱 test/e2e: Drop support for Kubernetes < v1.24.0 in the RuntimeSDK upgrade test

Author: k8s-ci-robot

test/e2e/Makefile

@@ -96,7 +96,6 @@ cluster-templates-v1beta1: $(KUSTOMIZE) ## Generate cluster templates for v1beta
 	$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1beta1/cluster-template-upgrades --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1beta1/cluster-template-upgrades.yaml
 	$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1beta1/cluster-template-upgrades-cgroupfs --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1beta1/cluster-template-upgrades-cgroupfs.yaml
 	$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1beta1/cluster-template-upgrades-runtimesdk --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1beta1/cluster-template-upgrades-runtimesdk.yaml
-	$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1beta1/cluster-template-upgrades-runtimesdk-cgroupfs --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1beta1/cluster-template-upgrades-runtimesdk-cgroupfs.yaml
 	$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1beta1/cluster-template-kcp-scale-in --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1beta1/cluster-template-kcp-scale-in.yaml
 	$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1beta1/cluster-template-ipv6 --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1beta1/cluster-template-ipv6.yaml
 	$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1beta1/cluster-template-topology --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1beta1/cluster-template-topology.yaml

test/e2e/cluster_upgrade_runtimesdk.go

@@ -282,9 +282,8 @@ func clusterUpgradeWithRuntimeSDKSpec(ctx context.Context, inputGetter func() cl
 func extensionConfig(specName string, namespace *corev1.Namespace) *runtimev1.ExtensionConfig {
 	return &runtimev1.ExtensionConfig{
 		ObjectMeta: metav1.ObjectMeta{
-			// FIXME(sbueringer): use constant name for now as we have to be able to reference it in the ClusterClass.
-			// Random generate later on again when Yuvaraj's PR has split up the cluster lifecycle.
-			//Name: fmt.Sprintf("%s-%s", specName, util.RandomString(6)),
+			// Note: We have to use a constant name here as we have to be able to reference it in the ClusterClass
+			// when configuring external patches.
 			Name: specName,
 			Annotations: map[string]string{
 				runtimev1.InjectCAFromSecretAnnotation: fmt.Sprintf("%s/webhook-service-cert", namespace.Name),

test/e2e/cluster_upgrade_runtimesdk_test.go

@@ -28,26 +28,10 @@ import (
 
 var _ = Describe("When upgrading a workload cluster using ClusterClass with RuntimeSDK [PR-Informing] [ClusterClass]", func() {
 	clusterUpgradeWithRuntimeSDKSpec(ctx, func() clusterUpgradeWithRuntimeSDKSpecInput {
-		// "upgrades" is the same as the "topology" flavor but with an additional MachinePool.
-		flavor := pointer.String("upgrades-runtimesdk")
-		// For KubernetesVersionUpgradeFrom < v1.24 we have to use upgrades-cgroupfs flavor.
-		// This is because kind and CAPD only support:
-		// * cgroupDriver cgroupfs for Kubernetes < v1.24
-		// * cgroupDriver systemd for Kubernetes >= v1.24.
-		// Notes:
-		// * We always use a ClusterClass-based cluster-template for the upgrade test
-		// * The ClusterClass will automatically adjust the cgroupDriver for KCP and MDs.
-		// * We have to handle the MachinePool ourselves
-		// * The upgrades-cgroupfs flavor uses an MP which is pinned to cgroupfs
-		// * During the upgrade UpgradeMachinePoolAndWait automatically drops the cgroupfs pinning
-		//   when the target version is >= v1.24.
-		// TODO: We can remove this after the v1.25 release as we then only test the v1.24=>v1.25 upgrade.
 		version, err := semver.ParseTolerant(e2eConfig.GetVariable(KubernetesVersionUpgradeFrom))
 		Expect(err).ToNot(HaveOccurred(), "Invalid argument, KUBERNETES_VERSION_UPGRADE_FROM is not a valid version")
 		if version.LT(semver.MustParse("1.24.0")) {
-			// "upgrades-cgroupfs" is the same as the "topology" flavor but with an additional MachinePool
-			// with pinned cgroupDriver to cgroupfs.
-			flavor = pointer.String("upgrades-runtimesdk-cgroupfs")
+			Fail("This test only supports upgrades from Kubernetes >= v1.24.0")
 		}
 
 		return clusterUpgradeWithRuntimeSDKSpecInput{
@@ -56,7 +40,8 @@ var _ = Describe("When upgrading a workload cluster using ClusterClass with Runt
 			BootstrapClusterProxy: bootstrapClusterProxy,
 			ArtifactFolder:        artifactFolder,
 			SkipCleanup:           skipCleanup,
-			Flavor:                flavor,
+			// "upgrades" is the same as the "topology" flavor but with an additional MachinePool.
+			Flavor: pointer.String("upgrades-runtimesdk"),
 		}
 	})
 })

test/e2e/config/docker.yaml

@@ -191,7 +191,6 @@ providers:
     - sourcePath: "../data/infrastructure-docker/v1beta1/cluster-template-upgrades.yaml"
     - sourcePath: "../data/infrastructure-docker/v1beta1/cluster-template-upgrades-cgroupfs.yaml"
     - sourcePath: "../data/infrastructure-docker/v1beta1/cluster-template-upgrades-runtimesdk.yaml"
-    - sourcePath: "../data/infrastructure-docker/v1beta1/cluster-template-upgrades-runtimesdk-cgroupfs.yaml"
     - sourcePath: "../data/infrastructure-docker/v1beta1/cluster-template-kcp-scale-in.yaml"
     - sourcePath: "../data/infrastructure-docker/v1beta1/cluster-template-ipv6.yaml"
     - sourcePath: "../data/infrastructure-docker/v1beta1/cluster-template-topology.yaml"