Merge pull request #2032 from sbueringer/pr-remove-node-labeling

🌱 Remove NodeLabeling feature gate

Author: k8s-ci-robot

docs/proposal/node-affinity-and-anti-affinity.md

@@ -260,7 +260,7 @@ A new controller is added which is responsible for propagating the labels with a
 Two new feature flags are introduced to control the availability of these new behaviors:
 
 1. **NodeAntiAffinity** which is set to `false` by default. This controls the creation of cluster modules to dictate anti affinity for VM placement.
-2. **NodeLabeling** which is set to `false` by default. This controls the propagation of labels with a special prefix from Machine to Node objects. Starting from v1.7.0 release, this feature flag is deprecated and this functionality will not be provided by CAPV. CAPI v1.4.0 natively supports this feature.
+2. **NodeLabeling** which is set to `false` by default. This controls the propagation of labels with a special prefix from Machine to Node objects. Starting from v1.7.0 release, this feature flag is deprecated and this functionality will not be provided by CAPV. CAPI v1.4.0 natively supports this feature. Starting with v1.8.0 the feature gate has been removed.
 
 ## Upgrade Strategy
 

feature/feature.go

@@ -32,19 +32,6 @@ const (
 	//
 	// alpha: v1.4
 	NodeAntiAffinity featuregate.Feature = "NodeAntiAffinity"
-
-	//nolint: gocritic
-	// NodeLabeling is a feature gate for the functionality to propagate Machine labels
-	// with the prefix to the Node objects.
-	// This is a stop-gap measure which will be removed when we have this functionality
-	// present in CAPI.
-	// See https://github.com/kubernetes-sigs/cluster-api/pull/6255
-	// Since this is natively supported in CAPI with the v1.4 release, this feature is being
-	// deprecated.
-	//
-	// alpha: v1.4
-	// deprecated: v1.7
-	NodeLabeling featuregate.Feature = "NodeLabeling"
 )
 
 func init() {
@@ -56,5 +43,4 @@ func init() {
 var defaultCAPVFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{
 	// Every feature should be initiated here:
 	NodeAntiAffinity: {Default: false, PreRelease: featuregate.Alpha},
-	NodeLabeling:     {Default: false, PreRelease: featuregate.Deprecated},
 }

main.go

@@ -300,16 +300,8 @@ func setupVAPIControllers(ctx *context.ControllerManagerContext, mgr ctrlmgr.Man
 	if err := controllers.AddVsphereClusterIdentityControllerToManager(ctx, mgr); err != nil {
 		return err
 	}
-	if err := controllers.AddVSphereDeploymentZoneControllerToManager(ctx, mgr); err != nil {
-		return err
-	}
 
-	if feature.Gates.Enabled(feature.NodeLabeling) {
-		setupLog.Info("Use of this feature flag is deprecated. Please consider unsetting this feature flag."+
-			"This flag does not enable the node labeling feature anymore. Consider using the cluster-api node labeling functionality instead.",
-			"flag", feature.NodeLabeling, "value", "true")
-	}
-	return nil
+	return controllers.AddVSphereDeploymentZoneControllerToManager(ctx, mgr)
 }
 
 func setupSupervisorControllers(ctx *context.ControllerManagerContext, mgr ctrlmgr.Manager) error {