Skip to content

Commit e57c6a5

Browse files
weng271190436Wei Weng
andauthored
chore: remove v1alpha1 member cluster placement controller (#299)
* remove v1alpha1 member cluster placement controller Signed-off-by: Wei Weng <Wei.Weng@microsoft.com> * add a test back Signed-off-by: Wei Weng <Wei.Weng@microsoft.com> --------- Signed-off-by: Wei Weng <Wei.Weng@microsoft.com> Co-authored-by: Wei Weng <Wei.Weng@microsoft.com>
1 parent 8aa90ad commit e57c6a5

File tree

6 files changed

+5
-792
lines changed

6 files changed

+5
-792
lines changed

cmd/hubagent/workload/setup.go

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ import (
3737
"github.com/kubefleet-dev/kubefleet/pkg/controllers/clusterinventory/clusterprofile"
3838
"github.com/kubefleet-dev/kubefleet/pkg/controllers/clusterresourceplacementeviction"
3939
"github.com/kubefleet-dev/kubefleet/pkg/controllers/clusterresourceplacementstatuswatcher"
40-
"github.com/kubefleet-dev/kubefleet/pkg/controllers/memberclusterplacement"
4140
"github.com/kubefleet-dev/kubefleet/pkg/controllers/overrider"
4241
"github.com/kubefleet-dev/kubefleet/pkg/controllers/placement"
4342
"github.com/kubefleet-dev/kubefleet/pkg/controllers/placementwatcher"
@@ -70,8 +69,7 @@ const (
7069

7170
resourceChangeControllerName = "resource-change-controller"
7271

73-
schedulerQueueName = "scheduler-queue"
74-
mcPlacementControllerName = "memberCluster-placement-controller"
72+
schedulerQueueName = "scheduler-queue"
7573
)
7674

7775
var (
@@ -175,14 +173,6 @@ func SetupControllers(ctx context.Context, wg *sync.WaitGroup, mgr ctrl.Manager,
175173
rateLimiter := options.DefaultControllerRateLimiter(opts.RateLimiterOpts)
176174
var clusterResourcePlacementControllerV1Beta1 controller.Controller
177175
var resourcePlacementController controller.Controller
178-
var memberClusterPlacementController controller.Controller
179-
if opts.EnableV1Alpha1APIs {
180-
klog.Info("Setting up member cluster change controller")
181-
mcp := &memberclusterplacement.Reconciler{
182-
InformerManager: dynamicInformerManager,
183-
}
184-
memberClusterPlacementController = controller.NewController(mcPlacementControllerName, controller.NamespaceKeyFunc, mcp.Reconcile, rateLimiter)
185-
}
186176

187177
if opts.EnableV1Beta1APIs {
188178
for _, gvk := range v1Beta1RequiredGVKs {
@@ -512,7 +502,6 @@ func SetupControllers(ctx context.Context, wg *sync.WaitGroup, mgr ctrl.Manager,
512502
ClusterResourcePlacementControllerV1Beta1: clusterResourcePlacementControllerV1Beta1,
513503
ResourcePlacementController: resourcePlacementController,
514504
ResourceChangeController: resourceChangeController,
515-
MemberClusterPlacementController: memberClusterPlacementController,
516505
InformerManager: dynamicInformerManager,
517506
ResourceConfig: resourceConfig,
518507
SkippedNamespaces: skippedNamespaces,

pkg/controllers/memberclusterplacement/membercluster_controller.go

Lines changed: 0 additions & 147 deletions
This file was deleted.

0 commit comments

Comments
 (0)