Skip to content

Commit f1a1f82

Browse files
weng271190436Wei Weng
andauthored
chore: remove fleet v1alpha1 internal member cluster controller (#343)
* remove v1alpha1 internal member cluster controller Signed-off-by: Wei Weng <[email protected]> * make v1beta1 the default Signed-off-by: Wei Weng <[email protected]> --------- Signed-off-by: Wei Weng <[email protected]> Co-authored-by: Wei Weng <[email protected]>
1 parent 677dc3b commit f1a1f82

File tree

7 files changed

+2
-1353
lines changed

7 files changed

+2
-1353
lines changed

cmd/mcs-controller-manager/main.go

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ import (
4141
fleetnetv1alpha1 "go.goms.io/fleet-networking/api/v1alpha1"
4242
fleetnetv1beta1 "go.goms.io/fleet-networking/api/v1beta1"
4343
"go.goms.io/fleet-networking/pkg/common/hubconfig"
44-
imcv1alpha1 "go.goms.io/fleet-networking/pkg/controllers/member/internalmembercluster/v1alpha1"
4544
imcv1beta1 "go.goms.io/fleet-networking/pkg/controllers/member/internalmembercluster/v1beta1"
4645
"go.goms.io/fleet-networking/pkg/controllers/multiclusterservice"
4746
)
@@ -61,8 +60,7 @@ var (
6160
tlsClientInsecure = flag.Bool("tls-insecure", false, "Enable TLSClientConfig.Insecure property. Enabling this will make the connection inSecure (should be 'true' for testing purpose only.)")
6261
fleetSystemNamespace = flag.String("fleet-system-namespace", "fleet-system", "The reserved system namespace used by fleet.")
6362

64-
isV1Alpha1APIEnabled = flag.Bool("enable-v1alpha1-apis", true, "If set, the agents will watch for the v1alpha1 APIs.")
65-
isV1Beta1APIEnabled = flag.Bool("enable-v1beta1-apis", false, "If set, the agents will watch for the v1beta1 APIs.")
63+
isV1Beta1APIEnabled = flag.Bool("enable-v1beta1-apis", true, "If set, the agents will watch for the v1beta1 APIs.")
6664

6765
enableNetworkingFeatures = flag.Bool("enable-networking-features", true, "If set, the networking features will be enabled. When disabled, only heartbeat functionality is preserved.")
6866
)
@@ -249,19 +247,6 @@ func setupControllersWithManager(_ context.Context, hubMgr, memberMgr manager.Ma
249247
memberClient := memberMgr.GetClient()
250248
hubClient := hubMgr.GetClient()
251249

252-
// Always setup heartbeat controllers regardless of networking features flag
253-
if *isV1Alpha1APIEnabled {
254-
klog.V(1).InfoS("Create internalmembercluster (v1alpha1 API) reconciler")
255-
if err := (&imcv1alpha1.Reconciler{
256-
MemberClient: memberClient,
257-
HubClient: hubClient,
258-
AgentType: fleetv1alpha1.MultiClusterServiceAgent,
259-
}).SetupWithManager(hubMgr); err != nil {
260-
klog.ErrorS(err, "Unable to create internalmembercluster (v1alpha1 API) reconciler")
261-
return err
262-
}
263-
}
264-
265250
if *isV1Beta1APIEnabled {
266251
klog.V(1).InfoS("Create internalmembercluster (v1beta1 API) reconciler")
267252
if err := (&imcv1beta1.Reconciler{

cmd/member-net-controller-manager/main.go

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ import (
4949
"go.goms.io/fleet-networking/pkg/controllers/member/endpointslice"
5050
"go.goms.io/fleet-networking/pkg/controllers/member/endpointsliceexport"
5151
"go.goms.io/fleet-networking/pkg/controllers/member/endpointsliceimport"
52-
imcv1alpha1 "go.goms.io/fleet-networking/pkg/controllers/member/internalmembercluster/v1alpha1"
5352
imcv1beta1 "go.goms.io/fleet-networking/pkg/controllers/member/internalmembercluster/v1beta1"
5453
"go.goms.io/fleet-networking/pkg/controllers/member/internalserviceexport"
5554
"go.goms.io/fleet-networking/pkg/controllers/member/internalserviceimport"
@@ -71,8 +70,7 @@ var (
7170
tlsClientInsecure = flag.Bool("tls-insecure", false, "Enable TLSClientConfig.Insecure property. Enabling this will make the connection inSecure (should be 'true' for testing purpose only.)")
7271
fleetSystemNamespace = flag.String("fleet-system-namespace", "fleet-system", "The reserved system namespace used by fleet.")
7372

74-
isV1Alpha1APIEnabled = flag.Bool("enable-v1alpha1-apis", true, "If set, the agents will watch for the v1alpha1 APIs.")
75-
isV1Beta1APIEnabled = flag.Bool("enable-v1beta1-apis", false, "If set, the agents will watch for the v1beta1 APIs.")
73+
isV1Beta1APIEnabled = flag.Bool("enable-v1beta1-apis", true, "If set, the agents will watch for the v1beta1 APIs.")
7674

7775
enableTrafficManagerFeature = flag.Bool("enable-traffic-manager-feature", true, "If set, the traffic manager feature will be enabled.")
7876

@@ -276,19 +274,6 @@ func setupControllersWithManager(ctx context.Context, hubMgr, memberMgr manager.
276274
memberClient := memberMgr.GetClient()
277275
hubClient := hubMgr.GetClient()
278276

279-
// Always setup heartbeat controllers regardless of networking features flag
280-
if *isV1Alpha1APIEnabled {
281-
klog.V(1).InfoS("Create internalmembercluster (v1alpha1 API) reconciler")
282-
if err := (&imcv1alpha1.Reconciler{
283-
MemberClient: memberClient,
284-
HubClient: hubClient,
285-
AgentType: fleetv1alpha1.ServiceExportImportAgent,
286-
}).SetupWithManager(hubMgr); err != nil {
287-
klog.ErrorS(err, "Unable to create internalmembercluster (v1alpha1 API) reconciler")
288-
return err
289-
}
290-
}
291-
292277
if *isV1Beta1APIEnabled {
293278
klog.V(1).InfoS("Create internalmembercluster (v1beta1 API) reconciler")
294279
if err := (&imcv1beta1.Reconciler{

config/rbac/role.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ rules:
2525
- watch
2626
- apiGroups:
2727
- cluster.kubernetes-fleet.io
28-
- fleet.azure.com
2928
resources:
3029
- internalmemberclusters
3130
verbs:
@@ -34,7 +33,6 @@ rules:
3433
- watch
3534
- apiGroups:
3635
- cluster.kubernetes-fleet.io
37-
- fleet.azure.com
3836
resources:
3937
- internalmemberclusters/status
4038
verbs:

pkg/controllers/member/internalmembercluster/v1alpha1/controller.go

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

0 commit comments

Comments
 (0)