wip: Remove DeployALBIngressController from v1alpha, fix make verify issues

Author: jamand

pkg/apis/config/v1alpha1/types.go

@@ -33,9 +33,6 @@ type ControllerConfiguration struct {
 	// +optional
 	RegistryCaches []RegistryCacheConfiguration `json:"registryCaches,omitempty"`
 
-	// DeployALBIngressController
-	DeployALBIngressController bool `json:"deployALBIngressController"`
-
 	// CustomLabelDomain is the domain prefix for custom labels applied to STACKIT infrastructure resources.
 	// For example, cluster labels will use "<domain>/cluster" (default: "kubernetes.io").
 	// +optional

pkg/apis/config/v1alpha1/zz_generated.conversion.go

@@ -315,7 +315,7 @@ var _ = Describe("ValuesProvider", func() {
 		mgr = mockmanager.NewMockManager(ctrl)
 		mgr.EXPECT().GetClient().Return(c)
 		mgr.EXPECT().GetScheme().Return(scheme)
-		vp = NewValuesProvider(mgr, true, "kubernetes.io")
+		vp = NewValuesProvider(mgr, "kubernetes.io")
 	})
 
 	AfterEach(func() {
@@ -497,6 +497,11 @@ var _ = Describe("ValuesProvider", func() {
 		})
 
 		BeforeEach(func() {
+			Expect(feature.MutableGate.SetFromMap(map[string]bool{string(feature.STACKITALBControllerManager): true})).To(Succeed())
+			DeferCleanup(func() {
+				Expect(feature.MutableGate.SetFromMap(map[string]bool{string(feature.STACKITALBControllerManager): false})).To(Succeed())
+			})
+
 			c.EXPECT().Get(ctx, cpConfigKey, &corev1.Secret{}).DoAndReturn(clientGet(cpConfig))
 			c.EXPECT().Delete(context.TODO(), &networkingv1.NetworkPolicy{ObjectMeta: metav1.ObjectMeta{Name: "allow-kube-apiserver-to-csi-snapshot-validation", Namespace: cp.Namespace}})
 
@@ -658,7 +663,7 @@ var _ = Describe("ValuesProvider", func() {
 					stackitCCMDeletion(ctx, c)
 				}
 
-				vpStackitConf := NewValuesProvider(mgr, true, "kubernetes.io")
+				vpStackitConf := NewValuesProvider(mgr, "kubernetes.io")
 				values, err := vpStackitConf.GetControlPlaneChartValues(ctx, cp, &testCluster, fakeSecretsManager, checksums, false)
 				Expect(err).NotTo(HaveOccurred())
 				Expect(values).To(HaveKey(openstack.STACKITCloudControllerManagerName))
@@ -773,7 +778,7 @@ var _ = Describe("ValuesProvider", func() {
 				mgr.EXPECT().GetClient().Return(c)
 				mgr.EXPECT().GetScheme().Return(scheme)
 
-				vpCustomDomain := NewValuesProvider(mgr, true, customDomain)
+				vpCustomDomain := NewValuesProvider(mgr, customDomain)
 				values, err := vpCustomDomain.GetControlPlaneChartValues(ctx, cp, &testCluster, fakeSecretsManager, checksums, false)
 				Expect(err).NotTo(HaveOccurred())
 

pkg/controller/controlplane/valuesprovider_test.go

@@ -76,16 +76,11 @@ func RegisterHealthChecks(ctx context.Context, mgr manager.Manager, opts healthc
 			HealthCheck:   general.NewSeedDeploymentHealthChecker(controlplane.CSIStackitPrefix + "-" + openstack.CSISnapshotControllerName),
 			PreCheckFunc:  checkCSISTACKIT,
 		},
-	}
-
-	if controlplane.DeployALBIngressController {
-		healthchecks = append(healthchecks,
-			healthcheck.ConditionTypeToHealthCheck{
-				ConditionType: string(gardencorev1beta1.ShootControlPlaneHealthy),
-				HealthCheck:   general.NewSeedDeploymentHealthChecker(openstack.STACKITALBControllerManagerName),
-				PreCheckFunc:  checkALB,
-			},
-		)
+		{
+			ConditionType: string(gardencorev1beta1.ShootControlPlaneHealthy),
+			HealthCheck:   general.NewSeedDeploymentHealthChecker(openstack.STACKITALBControllerManagerName),
+			PreCheckFunc:  checkALB,
+		},
 	}
 
 	if err := healthcheck.DefaultRegistration(