🌱 Remove deprecated ClusterResourceSet feature gate

Author: aman4433

.golangci.yml

@@ -261,10 +261,6 @@ linters:
       - linters:
           - staticcheck
         text: 'SA1019: (clusterv1alpha3.*|clusterv1alpha4.*) is deprecated: This type will be removed in one of the next releases.'
-        # Specific exclude rules for deprecated feature flags
-      - linters:
-          - staticcheck
-        text: 'SA1019: feature.ClusterResourceSet is deprecated: ClusterResourceSet feature is now GA and the corresponding feature flag will be removed in 1.12 release.'
         # v1Beta1 deprecated fields
       - linters:
           - staticcheck

feature/feature.go

@@ -35,15 +35,6 @@ const (
 	// beta: v1.7
 	MachinePool featuregate.Feature = "MachinePool"
 
-	// ClusterResourceSet is a feature gate for the ClusterResourceSet functionality.
-	//
-	// alpha: v0.3
-	// beta: v0.4
-	// GA: v1.10
-	//
-	// Deprecated: ClusterResourceSet feature is now GA and the corresponding feature flag will be removed in 1.12 release.
-	ClusterResourceSet featuregate.Feature = "ClusterResourceSet"
-
 	// ClusterTopology is a feature gate for the ClusterClass and managed topologies functionality.
 	//
 	// alpha: v0.4
@@ -91,7 +82,6 @@ func init() {
 // To add a new feature, define a key for it above and add it here.
 var defaultClusterAPIFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{
 	// Every feature should be initiated here:
-	ClusterResourceSet:        {Default: true, PreRelease: featuregate.GA},
 	MachinePool:               {Default: true, PreRelease: featuregate.Beta},
 	MachineSetPreflightChecks: {Default: true, PreRelease: featuregate.Beta},
 	MachineWaitForVolumeDetachConsiderVolumeAttachments: {Default: true, PreRelease: featuregate.Beta},

internal/webhooks/clusterresourceset.go

@@ -30,7 +30,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
 	addonsv1 "sigs.k8s.io/cluster-api/api/addons/v1beta2"
-	"sigs.k8s.io/cluster-api/feature"
 )
 
 // ClusterResourceSet implements a validation and defaulting webhook for ClusterResourceSet.
@@ -93,14 +92,7 @@ func (webhook *ClusterResourceSet) ValidateDelete(_ context.Context, _ runtime.O
 func (webhook *ClusterResourceSet) validate(oldCRS, newCRS *addonsv1.ClusterResourceSet) error {
 	var allErrs field.ErrorList
 
-	// NOTE: ClusterResourceSet is behind ClusterResourceSet feature gate flag; the web hook
-	// must prevent creating new objects when the feature flag is disabled.
-	if !feature.Gates.Enabled(feature.ClusterResourceSet) {
-		return field.Forbidden(
-			field.NewPath("spec"),
-			"can be set only if the ClusterResourceSet feature flag is enabled",
-		)
-	}
+	// NOTE: The "if !feature.Gates.Enabled(feature.ClusterResourceSet)" block has been removed.
 
 	// Validate selector parses as Selector
 	selector, err := metav1.LabelSelectorAsSelector(&newCRS.Spec.ClusterSelector)

internal/webhooks/clusterresourcesetbinding.go

@@ -28,7 +28,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
 	addonsv1 "sigs.k8s.io/cluster-api/api/addons/v1beta2"
-	"sigs.k8s.io/cluster-api/feature"
 )
 
 func (webhook *ClusterResourceSetBinding) SetupWebhookWithManager(mgr ctrl.Manager) error {
@@ -75,14 +74,7 @@ func (webhook *ClusterResourceSetBinding) ValidateDelete(_ context.Context, _ ru
 func (webhook *ClusterResourceSetBinding) validate(oldCRSB, newCRSB *addonsv1.ClusterResourceSetBinding) error {
 	var allErrs field.ErrorList
 
-	// NOTE: ClusterResourceSet is behind ClusterResourceSet feature gate flag; the web hook
-	// must prevent creating new objects in case the feature flag is disabled.
-	if !feature.Gates.Enabled(feature.ClusterResourceSet) {
-		return field.Forbidden(
-			field.NewPath("spec"),
-			"can be set only if the ClusterResourceSet feature flag is enabled",
-		)
-	}
+	// NOTE: The entire "if !feature.Gates.Enabled(feature.ClusterResourceSet)" block has been removed.
 
 	if oldCRSB != nil && oldCRSB.Spec.ClusterName != "" && oldCRSB.Spec.ClusterName != newCRSB.Spec.ClusterName {
 		allErrs = append(allErrs,

main.go

@@ -731,24 +731,6 @@ func setupReconcilers(ctx context.Context, mgr ctrl.Manager, watchNamespaces map
 		}
 	}
 
-	if feature.Gates.Enabled(feature.ClusterResourceSet) {
-		if err := (&controllers.ClusterResourceSetReconciler{
-			Client:           mgr.GetClient(),
-			ClusterCache:     clusterCache,
-			WatchFilterValue: watchFilterValue,
-		}).SetupWithManager(ctx, mgr, concurrency(clusterResourceSetConcurrency), partialSecretCache); err != nil {
-			setupLog.Error(err, "Unable to create controller", "controller", "ClusterResourceSet")
-			os.Exit(1)
-		}
-		if err := (&controllers.ClusterResourceSetBindingReconciler{
-			Client:           mgr.GetClient(),
-			WatchFilterValue: watchFilterValue,
-		}).SetupWithManager(ctx, mgr, concurrency(clusterResourceSetConcurrency)); err != nil {
-			setupLog.Error(err, "Unable to create controller", "controller", "ClusterResourceSetBinding")
-			os.Exit(1)
-		}
-	}
-
 	if err := (&controllers.MachineHealthCheckReconciler{
 		Client:           mgr.GetClient(),
 		ClusterCache:     clusterCache,