Skip to content

Commit 3cfd101

Browse files
authored
Merge pull request #5941 from XiShanYongYe-Chang/cherry-pick-#5899-for-release-1.11
Disable cluster failover by default which should be explicitly enabled by administrators after a fully evaluation
2 parents 52d44c1 + e300924 commit 3cfd101

File tree

4 files changed

+493
-8
lines changed

4 files changed

+493
-8
lines changed

Diff for: artifacts/deploy/karmada-controller-manager.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
- --cluster-status-update-frequency=10s
3232
- --failover-eviction-timeout=30s
3333
- --controllers=*,hpaScaleTargetMarker,deploymentReplicasSyncer
34-
- --feature-gates=PropagationPolicyPreemption=true,MultiClusterService=true
34+
- --feature-gates=Failover=true,PropagationPolicyPreemption=true,MultiClusterService=true
3535
- --health-probe-bind-address=0.0.0.0:10357
3636
- --v=4
3737
livenessProbe:

Diff for: cmd/controller-manager/app/controllermanager.go

-3
Original file line numberDiff line numberDiff line change
@@ -592,9 +592,6 @@ func startGracefulEvictionController(ctx controllerscontext.Context) (enabled bo
592592
}
593593

594594
func startApplicationFailoverController(ctx controllerscontext.Context) (enabled bool, err error) {
595-
if !features.FeatureGate.Enabled(features.Failover) {
596-
return false, nil
597-
}
598595
rbApplicationFailoverController := applicationfailover.RBApplicationFailoverController{
599596
Client: ctx.Mgr.GetClient(),
600597
EventRecorder: ctx.Mgr.GetEventRecorderFor(applicationfailover.RBApplicationFailoverControllerName),

0 commit comments

Comments
 (0)