add MultiClusterService featuregate

Signed-off-by: changzhen <[email protected]>
karmada-io · Nov 30, 2023 · 53252a3 · 53252a3
1 parent 68d937e
commit 53252a3
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 7 deletions.
diff --git a/artifacts/agent/karmada-agent.yaml b/artifacts/agent/karmada-agent.yaml
@@ -32,7 +32,7 @@ spec:
             - --cluster-status-update-frequency=10s
             - --bind-address=0.0.0.0
             - --secure-port=10357
-            - --feature-gates=CustomizedClusterResourceModeling=true
+            - --feature-gates=CustomizedClusterResourceModeling=true,MultiClusterService=true
             - --v=4
           livenessProbe:
             httpGet:

diff --git a/artifacts/deploy/karmada-controller-manager.yaml b/artifacts/deploy/karmada-controller-manager.yaml
@@ -31,7 +31,7 @@ spec:
             - --secure-port=10357
             - --failover-eviction-timeout=30s
             - --controllers=*,hpaReplicasSyncer
-            - --feature-gates=PropagationPolicyPreemption=true
+            - --feature-gates=PropagationPolicyPreemption=true,MultiClusterService=true
             - --v=4
           livenessProbe:
             httpGet:

diff --git a/cmd/agent/app/agent.go b/cmd/agent/app/agent.go
@@ -48,6 +48,7 @@ import (
 	"github.com/karmada-io/karmada/pkg/controllers/mcs"
 	"github.com/karmada-io/karmada/pkg/controllers/multiclusterservice"
 	"github.com/karmada-io/karmada/pkg/controllers/status"
+	"github.com/karmada-io/karmada/pkg/features"
 	karmadaclientset "github.com/karmada-io/karmada/pkg/generated/clientset/versioned"
 	"github.com/karmada-io/karmada/pkg/karmadactl/util/apiclient"
 	"github.com/karmada-io/karmada/pkg/metrics"
@@ -128,7 +129,9 @@ func init() {
 	controllers["workStatus"] = startWorkStatusController
 	controllers["serviceExport"] = startServiceExportController
 	controllers["certRotation"] = startCertRotationController
-	controllers["endpointsliceCollect"] = startEndpointSliceCollectController
+	if features.FeatureGate.Enabled(features.MultiClusterService) {
+		controllers["endpointsliceCollect"] = startEndpointSliceCollectController
+	}
 }
 
 func run(ctx context.Context, opts *options.Options) error {

diff --git a/cmd/controller-manager/app/controllermanager.go b/cmd/controller-manager/app/controllermanager.go
@@ -225,9 +225,11 @@ func init() {
 	controllers["federatedHorizontalPodAutoscaler"] = startFederatedHorizontalPodAutoscalerController
 	controllers["cronFederatedHorizontalPodAutoscaler"] = startCronFederatedHorizontalPodAutoscalerController
 	controllers["hpaReplicasSyncer"] = startHPAReplicasSyncerController
-	controllers["multiclusterservice"] = startMCSController
-	controllers["endpointsliceCollect"] = startEndpointSliceCollectController
-	controllers["endpointsliceDispatch"] = startEndpointSliceDispatchController
+	if features.FeatureGate.Enabled(features.MultiClusterService) {
+		controllers["multiclusterservice"] = startMCSController
+		controllers["endpointsliceCollect"] = startEndpointSliceCollectController
+		controllers["endpointsliceDispatch"] = startEndpointSliceDispatchController
+	}
 }
 
 func startClusterController(ctx controllerscontext.Context) (enabled bool, err error) {

diff --git a/pkg/features/features.go b/pkg/features/features.go
@@ -37,6 +37,9 @@ const (
 
 	// PolicyPreemption indicates if high-priority PropagationPolicy/ClusterPropagationPolicy could preempt resource templates which are matched by low-priority PropagationPolicy/ClusterPropagationPolicy.
 	PolicyPreemption featuregate.Feature = "PropagationPolicyPreemption"
+
+	// MultiClusterService indicates if enable multi-cluster service function.
+	MultiClusterService featuregate.Feature = "MultiClusterService"
 )
 
 var (
@@ -50,6 +53,7 @@ var (
 		PropagateDeps:                     {Default: true, PreRelease: featuregate.Beta},
 		CustomizedClusterResourceModeling: {Default: true, PreRelease: featuregate.Beta},
 		PolicyPreemption:                  {Default: false, PreRelease: featuregate.Alpha},
+		MultiClusterService:               {Default: false, PreRelease: featuregate.Alpha},
 	}
 )
 

diff --git a/test/e2e/mcs_test.go b/test/e2e/mcs_test.go
@@ -879,7 +879,7 @@ func checkEndpointSliceSynced(provisionEPSList, consumptionEPSList *discoveryv1.
 
 	synced := false
 	for _, item := range provisionEPSList.Items {
-		if item.GetLabels()[discoveryv1.LabelManagedBy] == util.EndpointSliceControllerLabelValue {
+		if item.GetLabels()[discoveryv1.LabelManagedBy] == util.EndpointSliceDispatchControllerLabelValue {
 			continue
 		}
 		for _, consumptionItem := range consumptionEPSList.Items {