WIP

Author: dergeberl

cmd/gardener-extension-provider-stackit/app/app.go

@@ -184,11 +184,9 @@ func NewControllerManagerCommand(ctx context.Context) *cobra.Command {
 			configFileOpts.Completed().ApplyETCDStorage(&stackitseedprovider.DefaultAddOptions.ETCDStorage)
 			configFileOpts.Completed().ApplyHealthCheckConfig(&healthcheck.DefaultAddOptions.HealthCheckConfig)
 			configFileOpts.Completed().ApplyRegistryCaches(&stackitwebhookcontrolplane.DefaultAddOptions.RegistryCaches)
-			configFileOpts.Completed().ApplyDeployALBIngressController(&stackitcontrolplane.DeployALBIngressController)
 			configFileOpts.Completed().ApplyCustomLabelDomain(&stackitworker.DefaultAddOptions.CustomLabelDomain)
 			configFileOpts.Completed().ApplyCustomLabelDomain(&stackitcontrolplane.DefaultAddOptions.CustomLabelDomain)
 			configFileOpts.Completed().ApplyCustomLabelDomain(&stackitinfrastructure.DefaultAddOptions.CustomLabelDomain)
-			log.Info("DeployALBIngressController?", "deploy", configFileOpts.Completed().Config.DeployALBIngressController)
 
 			bastionCtrlOpts.Completed().Apply(&stackitbastion.DefaultAddOptions.Controller)
 			configFileOpts.Completed().ApplyCustomLabelDomain(&stackitbastion.DefaultAddOptions.CustomLabelDomain)

imagevector/images.yaml

@@ -133,5 +133,5 @@ images:
   tag: "v2.18.0"
 
 - name: stackit-alb-controller-manager
-  repository: reg3.infra.ske.eu01.stackit.cloud/temp/alb-controller-manager
-  tag: "1245"
+  repository: ghcr.io/stackitcloud/cloud-provider-stackit/application-load-balancer-controller-manager-dev
+  tag: "v1.34.0-132-g612f42f"

pkg/apis/config/types.go

@@ -31,9 +31,6 @@ type ControllerConfiguration struct {
 	// Deprecated: will be removed in a future version
 	RegistryCaches []RegistryCacheConfiguration
 
-	// DeployALBIngressController
-	DeployALBIngressController bool
-
 	// CustomLabelDomain is the domain prefix for custom labels applied to STACKIT infrastructure resources.
 	// For example, cluster labels will use "<domain>/cluster" (default: "kubernetes.io").
 	// NOTE: Only change this if you know what you are doing!!

pkg/cmd/config.go

@@ -75,10 +75,6 @@ func (c *Config) ApplyRegistryCaches(regCaches *[]config.RegistryCacheConfigurat
 	*regCaches = c.Config.RegistryCaches
 }
 
-func (c *Config) ApplyDeployALBIngressController(deployALBIngressController *bool) {
-	*deployALBIngressController = c.Config.DeployALBIngressController
-}
-
 // ApplyCustomLabelDomain sets the custom label domain configuration for infrastructure resources.
 func (c *Config) ApplyCustomLabelDomain(customLabelDomain *string) {
 	*customLabelDomain = c.Config.CustomLabelDomain

pkg/controller/controlplane/add.go

@@ -22,8 +22,6 @@ import (
 var (
 	// DefaultAddOptions are the default AddOptions for AddToManager.
 	DefaultAddOptions = AddOptions{}
-
-	DeployALBIngressController bool
 )
 
 // AddOptions are options to apply when adding the OpenStack controlplane controller to the manager.
@@ -46,7 +44,7 @@ func AddToManagerWithOptions(ctx context.Context, mgr manager.Manager, opts AddO
 	genericActuator, err := genericactuator.NewActuator(mgr, stackit.Name,
 		secretConfigsFunc, shootAccessSecretsFunc,
 		configChart, controlPlaneChart, controlPlaneShootChart, controlPlaneShootCRDsChart, storageClassChart,
-		NewValuesProvider(mgr, DeployALBIngressController, opts.CustomLabelDomain), extensionscontroller.ChartRendererFactoryFunc(util.NewChartRendererForShoot),
+		NewValuesProvider(mgr, opts.CustomLabelDomain), extensionscontroller.ChartRendererFactoryFunc(util.NewChartRendererForShoot),
 		imagevector.ImageVector(), "", nil, opts.WebhookServerNamespace)
 	if err != nil {
 		return err

pkg/controller/controlplane/valuesprovider.go

@@ -333,22 +333,20 @@ var (
 )
 
 // NewValuesProvider creates a new ValuesProvider for the generic actuator.
-func NewValuesProvider(mgr manager.Manager, deployALBIngressController bool, customLabelDomain string) genericactuator.ValuesProvider {
+func NewValuesProvider(mgr manager.Manager, customLabelDomain string) genericactuator.ValuesProvider {
 	return &valuesProvider{
-		client:                     mgr.GetClient(),
-		decoder:                    serializer.NewCodecFactory(mgr.GetScheme(), serializer.EnableStrict).UniversalDecoder(),
-		deployALBIngressController: deployALBIngressController,
-		customLabelDomain:          customLabelDomain,
+		client:            mgr.GetClient(),
+		decoder:           serializer.NewCodecFactory(mgr.GetScheme(), serializer.EnableStrict).UniversalDecoder(),
+		customLabelDomain: customLabelDomain,
 	}
 }
 
 // valuesProvider is a ValuesProvider that provides OpenStack-specific values for the 2 charts applied by the generic actuator.
 type valuesProvider struct {
 	genericactuator.NoopValuesProvider
-	client                     k8sclient.Client
-	decoder                    runtime.Decoder
-	deployALBIngressController bool
-	customLabelDomain          string
+	client            k8sclient.Client
+	decoder           runtime.Decoder
+	customLabelDomain string
 }
 
 // GetConfigChartValues returns the values for the config chart applied by the generic actuator.
@@ -732,7 +730,8 @@ func (vp *valuesProvider) getControlPlaneChartValues(ctx context.Context, cpConf
 		openstack.STACKITCloudControllerManagerName: stackitccm,
 	})
 
-	if vp.deployALBIngressController {
+	if feature.StackitALBControllerManager(cluster) {
+		// TODO(geberl) add a field in the shoot control plane provider option to enable the alb controller
 		fmt.Println("deploying ALB Ingress Controller")
 		albcm, err := getSTACKITALBCMChartValues(cpConfig, cluster, infra, stackitCredentialsConfig, apiEndpoints, scaledDown, stackitRegion)
 		if err != nil {

pkg/feature/feature.go

@@ -22,10 +22,14 @@ const (
 	UseSTACKITAPIInfrastructureController featuregate.Feature = "UseSTACKITAPIInfrastructureController"
 	// UseSTACKITMachineControllerManager Uses the STACKIT machine controller Manager to manage nodes.
 	UseSTACKITMachineControllerManager featuregate.Feature = "UseSTACKITMachineControllerManager"
+	// STACKITALBControllerManager Enables the STACKIT ALP controller manager.
+	STACKITALBControllerManager featuregate.Feature = "STACKITALBControllerManager"
 	// ShootUseSTACKITMachineControllerManager Uses the STACKIT machine controller Manager to manage nodes for a specific Shoot.
 	ShootUseSTACKITMachineControllerManager = "shoot.gardener.cloud/use-stackit-machine-controller-manager"
 	// ShootUseSTACKITAPIInfrastructureController Uses the STACKIT API to create the shoot resources instead of OpenStack for a specific Shoot.
 	ShootUseSTACKITAPIInfrastructureController = "shoot.gardener.cloud/use-stackit-api-infrastructure-controller"
+	// ShootSTACKITALBControllerManager Enables the STACKIT ALP controller manager for a specific Shoot.
+	ShootSTACKITALBControllerManager = "shoot.gardener.cloud/stackit-alb-controller-manager"
 )
 
 var (
@@ -46,6 +50,7 @@ var (
 		EnsureSTACKITLBDeletion:               {Default: true, PreRelease: featuregate.Alpha},
 		UseSTACKITAPIInfrastructureController: {Default: true, PreRelease: featuregate.Alpha},
 		UseSTACKITMachineControllerManager:    {Default: true, PreRelease: featuregate.Alpha},
+		STACKITALBControllerManager:           {Default: false, PreRelease: featuregate.Alpha},
 	}
 )
 
@@ -78,3 +83,16 @@ func UseStackitAPIInfrastructureController(cluster *extensionscontroller.Cluster
 	}
 	return Gate.Enabled(UseSTACKITAPIInfrastructureController)
 }
+
+func StackitALBControllerManager(cluster *extensionscontroller.Cluster) bool {
+	if cluster != nil && cluster.Shoot != nil {
+		annotation, ok := cluster.Shoot.Annotations[ShootSTACKITALBControllerManager]
+		if ok {
+			enabledByAnnotation, err := strconv.ParseBool(annotation)
+			if err == nil {
+				return enabledByAnnotation
+			}
+		}
+	}
+	return Gate.Enabled(STACKITALBControllerManager)
+}