Merge pull request #5947 from XiShanYongYe-Chang/cherry-pick-#5899-fo…

…r-release-1.10 Disable cluster failover by default which should be explicitly enabled by administrators after a fully evaluation
karmada-io · Dec 13, 2024 · 522efa0 · 522efa0
2 parents 8734c86 + 65b1ce3
commit 522efa0
Show file tree

Hide file tree

Showing 4 changed files with 493 additions and 8 deletions.
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=*,hpaScaleTargetMarker,deploymentReplicasSyncer
-            - --feature-gates=PropagationPolicyPreemption=true,MultiClusterService=true
+            - --feature-gates=Failover=true,PropagationPolicyPreemption=true,MultiClusterService=true
             - --v=4
           livenessProbe:
             httpGet:

diff --git a/cmd/controller-manager/app/controllermanager.go b/cmd/controller-manager/app/controllermanager.go
@@ -590,9 +590,6 @@ func startGracefulEvictionController(ctx controllerscontext.Context) (enabled bo
 }
 
 func startApplicationFailoverController(ctx controllerscontext.Context) (enabled bool, err error) {
-	if !features.FeatureGate.Enabled(features.Failover) {
-		return false, nil
-	}
 	rbApplicationFailoverController := applicationfailover.RBApplicationFailoverController{
 		Client:              ctx.Mgr.GetClient(),
 		EventRecorder:       ctx.Mgr.GetEventRecorderFor(applicationfailover.RBApplicationFailoverControllerName),