@@ -29,17 +29,14 @@ import (
2929 "k8s.io/klog/v2"
3030 clusterinventory "sigs.k8s.io/cluster-inventory-api/apis/v1alpha1"
3131 ctrl "sigs.k8s.io/controller-runtime"
32- workv1alpha1 "sigs.k8s.io/work-api/pkg/apis/v1alpha1"
3332
3433 clusterv1beta1 "github.com/kubefleet-dev/kubefleet/apis/cluster/v1beta1"
3534 placementv1beta1 "github.com/kubefleet-dev/kubefleet/apis/placement/v1beta1"
36- fleetv1alpha1 "github.com/kubefleet-dev/kubefleet/apis/v1alpha1"
3735 "github.com/kubefleet-dev/kubefleet/cmd/hubagent/options"
3836 "github.com/kubefleet-dev/kubefleet/pkg/controllers/bindingwatcher"
3937 "github.com/kubefleet-dev/kubefleet/pkg/controllers/clusterinventory/clusterprofile"
4038 "github.com/kubefleet-dev/kubefleet/pkg/controllers/clusterresourceplacementeviction"
4139 "github.com/kubefleet-dev/kubefleet/pkg/controllers/clusterresourceplacementstatuswatcher"
42- "github.com/kubefleet-dev/kubefleet/pkg/controllers/memberclusterplacement"
4340 "github.com/kubefleet-dev/kubefleet/pkg/controllers/overrider"
4441 "github.com/kubefleet-dev/kubefleet/pkg/controllers/placement"
4542 "github.com/kubefleet-dev/kubefleet/pkg/controllers/placementwatcher"
@@ -65,26 +62,17 @@ import (
6562)
6663
6764const (
68- crpControllerName = "cluster-resource-placement-controller"
69- crpControllerV1Alpha1Name = crpControllerName + "-v1alpha1"
70- crpControllerV1Beta1Name = crpControllerName + "-v1beta1"
71- rpControllerName = "resource-placement-controller"
72- placementControllerName = "placement-controller"
65+ crpControllerName = "cluster-resource-placement-controller"
66+ crpControllerV1Beta1Name = crpControllerName + "-v1beta1"
67+ rpControllerName = "resource-placement-controller"
68+ placementControllerName = "placement-controller"
7369
7470 resourceChangeControllerName = "resource-change-controller"
75- mcPlacementControllerName = "memberCluster-placement-controller"
7671
7772 schedulerQueueName = "scheduler-queue"
7873)
7974
8075var (
81- v1Alpha1RequiredGVKs = []schema.GroupVersionKind {
82- fleetv1alpha1 .GroupVersion .WithKind (fleetv1alpha1 .MemberClusterKind ),
83- fleetv1alpha1 .GroupVersion .WithKind (fleetv1alpha1 .InternalMemberClusterKind ),
84- fleetv1alpha1 .GroupVersion .WithKind (fleetv1alpha1 .ClusterResourcePlacementKind ),
85- workv1alpha1 .SchemeGroupVersion .WithKind (workv1alpha1 .WorkKind ),
86- }
87-
8876 v1Beta1RequiredGVKs = []schema.GroupVersionKind {
8977 clusterv1beta1 .GroupVersion .WithKind (clusterv1beta1 .MemberClusterKind ),
9078 clusterv1beta1 .GroupVersion .WithKind (clusterv1beta1 .InternalMemberClusterKind ),
@@ -187,22 +175,6 @@ func SetupControllers(ctx context.Context, wg *sync.WaitGroup, mgr ctrl.Manager,
187175 var clusterResourcePlacementControllerV1Beta1 controller.Controller
188176 var resourcePlacementController controller.Controller
189177 var memberClusterPlacementController controller.Controller
190- if opts .EnableV1Alpha1APIs {
191- for _ , gvk := range v1Alpha1RequiredGVKs {
192- if err = utils .CheckCRDInstalled (discoverClient , gvk ); err != nil {
193- klog .ErrorS (err , "unable to find the required CRD" , "GVK" , gvk )
194- return err
195- }
196- }
197- klog .Info ("Setting up clusterResourcePlacement v1alpha1 controller" )
198- clusterResourcePlacementControllerV1Alpha1 = controller .NewController (crpControllerV1Alpha1Name , controller .NamespaceKeyFunc , pc .ReconcileV1Alpha1 , rateLimiter )
199- klog .Info ("Setting up member cluster change controller" )
200- mcp := & memberclusterplacement.Reconciler {
201- InformerManager : dynamicInformerManager ,
202- PlacementController : clusterResourcePlacementControllerV1Alpha1 ,
203- }
204- memberClusterPlacementController = controller .NewController (mcPlacementControllerName , controller .NamespaceKeyFunc , mcp .Reconcile , rateLimiter )
205- }
206178
207179 if opts .EnableV1Beta1APIs {
208180 for _ , gvk := range v1Beta1RequiredGVKs {
0 commit comments