Skip to content

Commit 56a4628

Browse files
weng271190436Wei Wengryanzhang-oss
authored
chore: remove v1alpha1 internal MC and MC controllers (#300)
remove v1alpha1 internal MC and MC controllers Signed-off-by: Wei Weng <Wei.Weng@microsoft.com> Co-authored-by: Wei Weng <Wei.Weng@microsoft.com> Co-authored-by: Ryan Zhang <yangzhangrice@hotmail.com>
1 parent 98d0429 commit 56a4628

File tree

14 files changed

+38
-4465
lines changed

14 files changed

+38
-4465
lines changed

cmd/hubagent/main.go

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ import (
4747
fleetv1alpha1 "github.com/kubefleet-dev/kubefleet/apis/v1alpha1"
4848
"github.com/kubefleet-dev/kubefleet/cmd/hubagent/options"
4949
"github.com/kubefleet-dev/kubefleet/cmd/hubagent/workload"
50-
mcv1alpha1 "github.com/kubefleet-dev/kubefleet/pkg/controllers/membercluster/v1alpha1"
5150
mcv1beta1 "github.com/kubefleet-dev/kubefleet/pkg/controllers/membercluster/v1beta1"
5251
"github.com/kubefleet-dev/kubefleet/pkg/webhook"
5352
// +kubebuilder:scaffold:imports
@@ -137,16 +136,6 @@ func main() {
137136
}
138137

139138
klog.V(2).InfoS("starting hubagent")
140-
if opts.EnableV1Alpha1APIs {
141-
klog.Info("Setting up memberCluster v1alpha1 controller")
142-
if err = (&mcv1alpha1.Reconciler{
143-
Client: mgr.GetClient(),
144-
NetworkingAgentsEnabled: opts.NetworkingAgentsEnabled,
145-
}).SetupWithManager(mgr, "memberclusterv1alpha1-controller"); err != nil {
146-
klog.ErrorS(err, "unable to create v1alpha1 controller", "controller", "MemberCluster")
147-
exitWithErrorFunc()
148-
}
149-
}
150139
if opts.EnableV1Beta1APIs {
151140
klog.Info("Setting up memberCluster v1beta1 controller")
152141
if err = (&mcv1beta1.Reconciler{

cmd/memberagent/main.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ import (
5252
clusterv1beta1 "github.com/kubefleet-dev/kubefleet/apis/cluster/v1beta1"
5353
placementv1beta1 "github.com/kubefleet-dev/kubefleet/apis/placement/v1beta1"
5454
fleetv1alpha1 "github.com/kubefleet-dev/kubefleet/apis/v1alpha1"
55-
imcv1alpha1 "github.com/kubefleet-dev/kubefleet/pkg/controllers/internalmembercluster/v1alpha1"
5655
imcv1beta1 "github.com/kubefleet-dev/kubefleet/pkg/controllers/internalmembercluster/v1beta1"
5756
"github.com/kubefleet-dev/kubefleet/pkg/controllers/workapplier"
5857
workv1alpha1controller "github.com/kubefleet-dev/kubefleet/pkg/controllers/workv1alpha1"
@@ -377,12 +376,6 @@ func Start(ctx context.Context, hubCfg, memberConfig *rest.Config, hubOpts, memb
377376
klog.ErrorS(err, "Failed to create v1alpha1 controller", "controller", "work")
378377
return err
379378
}
380-
381-
klog.Info("Setting up the internalMemberCluster v1alpha1 controller")
382-
if err = imcv1alpha1.NewReconciler(hubMgr.GetClient(), memberMgr.GetClient(), workController).SetupWithManager(hubMgr, "internalmemberclusterv1alpha1-controller"); err != nil {
383-
klog.ErrorS(err, "Failed to create v1alpha1 controller", "controller", "internalMemberCluster")
384-
return fmt.Errorf("unable to create internalMemberCluster v1alpha1 controller: %w", err)
385-
}
386379
}
387380

388381
if *enableV1Beta1APIs {

pkg/controllers/internalmembercluster/v1alpha1/member_controller.go

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

0 commit comments

Comments
 (0)