Skip to content
This repository was archived by the owner on May 30, 2025. It is now read-only.

Commit 6db798c

Browse files
turkenhturkenh
committed
Pass management policy flag to the controllers
Signed-off-by: Hasan Turken <turkenh@gmail.com>
1 parent 44fa620 commit 6db798c

25 files changed

Lines changed: 225 additions & 80 deletions

‎pkg/controller/cache/managed.go‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,19 @@ func SetupCloudMemorystoreInstance(mgr ctrl.Manager, o controller.Options) error
6666
cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), scv1alpha1.StoreConfigGroupVersionKind, connection.WithTLSConfig(o.ESSOptions.TLSConfig)))
6767
}
6868

69-
r := managed.NewReconciler(mgr,
70-
resource.ManagedKind(v1beta1.CloudMemorystoreInstanceGroupVersionKind),
69+
opts := []managed.ReconcilerOption{
7170
managed.WithExternalConnecter(&connecter{client: mgr.GetClient()}),
7271
managed.WithPollInterval(o.PollInterval),
7372
managed.WithLogger(o.Logger.WithValues("controller", name)),
7473
managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))),
75-
managed.WithConnectionPublishers(cps...))
74+
managed.WithConnectionPublishers(cps...),
75+
}
76+
77+
if o.Features.Enabled(features.EnableAlphaManagementPolicies) {
78+
opts = append(opts, managed.WithManagementPolicies())
79+
}
80+
81+
r := managed.NewReconciler(mgr, resource.ManagedKind(v1beta1.CloudMemorystoreInstanceGroupVersionKind), opts...)
7682

7783
return ctrl.NewControllerManagedBy(mgr).
7884
Named(name).

‎pkg/controller/compute/address.go‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,19 @@ func SetupAddress(mgr ctrl.Manager, o controller.Options) error {
5959
cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), scv1alpha1.StoreConfigGroupVersionKind, connection.WithTLSConfig(o.ESSOptions.TLSConfig)))
6060
}
6161

62-
r := managed.NewReconciler(mgr,
63-
resource.ManagedKind(v1beta1.AddressGroupVersionKind),
62+
opts := []managed.ReconcilerOption{
6463
managed.WithExternalConnecter(&addressConnector{kube: mgr.GetClient()}),
65-
managed.WithConnectionPublishers(),
6664
managed.WithPollInterval(o.PollInterval),
6765
managed.WithLogger(o.Logger.WithValues("controller", name)),
6866
managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))),
69-
managed.WithConnectionPublishers(cps...))
67+
managed.WithConnectionPublishers(cps...),
68+
}
69+
70+
if o.Features.Enabled(features.EnableAlphaManagementPolicies) {
71+
opts = append(opts, managed.WithManagementPolicies())
72+
}
73+
74+
r := managed.NewReconciler(mgr, resource.ManagedKind(v1beta1.AddressGroupVersionKind), opts...)
7075

7176
return ctrl.NewControllerManagedBy(mgr).
7277
Named(name).

‎pkg/controller/compute/firewall.go‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,19 @@ func SetupFirewall(mgr ctrl.Manager, o controller.Options) error {
6262
cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), scv1alpha1.StoreConfigGroupVersionKind, connection.WithTLSConfig(o.ESSOptions.TLSConfig)))
6363
}
6464

65-
r := managed.NewReconciler(mgr,
66-
resource.ManagedKind(v1alpha1.FirewallGroupVersionKind),
65+
opts := []managed.ReconcilerOption{
6766
managed.WithExternalConnecter(&firewallConnector{kube: mgr.GetClient()}),
6867
managed.WithLogger(o.Logger.WithValues("controller", name)),
6968
managed.WithPollInterval(o.PollInterval),
7069
managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))),
71-
managed.WithConnectionPublishers(cps...))
70+
managed.WithConnectionPublishers(cps...),
71+
}
72+
73+
if o.Features.Enabled(features.EnableAlphaManagementPolicies) {
74+
opts = append(opts, managed.WithManagementPolicies())
75+
}
76+
77+
r := managed.NewReconciler(mgr, resource.ManagedKind(v1alpha1.FirewallGroupVersionKind), opts...)
7278

7379
return ctrl.NewControllerManagedBy(mgr).
7480
Named(name).

‎pkg/controller/compute/globaladdress.go‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,19 @@ func SetupGlobalAddress(mgr ctrl.Manager, o controller.Options) error {
6060
cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), scv1alpha1.StoreConfigGroupVersionKind, connection.WithTLSConfig(o.ESSOptions.TLSConfig)))
6161
}
6262

63-
r := managed.NewReconciler(mgr,
64-
resource.ManagedKind(v1beta1.GlobalAddressGroupVersionKind),
63+
opts := []managed.ReconcilerOption{
6564
managed.WithExternalConnecter(&gaConnector{kube: mgr.GetClient()}),
66-
managed.WithConnectionPublishers(),
6765
managed.WithPollInterval(o.PollInterval),
6866
managed.WithLogger(o.Logger.WithValues("controller", name)),
6967
managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))),
70-
managed.WithConnectionPublishers(cps...))
68+
managed.WithConnectionPublishers(cps...),
69+
}
70+
71+
if o.Features.Enabled(features.EnableAlphaManagementPolicies) {
72+
opts = append(opts, managed.WithManagementPolicies())
73+
}
74+
75+
r := managed.NewReconciler(mgr, resource.ManagedKind(v1beta1.GlobalAddressGroupVersionKind), opts...)
7176

7277
return ctrl.NewControllerManagedBy(mgr).
7378
Named(name).

‎pkg/controller/compute/network.go‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,19 @@ func SetupNetwork(mgr ctrl.Manager, o controller.Options) error {
6464
cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), scv1alpha1.StoreConfigGroupVersionKind, connection.WithTLSConfig(o.ESSOptions.TLSConfig)))
6565
}
6666

67-
r := managed.NewReconciler(mgr,
68-
resource.ManagedKind(v1beta1.NetworkGroupVersionKind),
67+
opts := []managed.ReconcilerOption{
6968
managed.WithExternalConnecter(&networkConnector{kube: mgr.GetClient()}),
70-
managed.WithConnectionPublishers(),
7169
managed.WithPollInterval(o.PollInterval),
7270
managed.WithLogger(o.Logger.WithValues("controller", name)),
7371
managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))),
74-
managed.WithConnectionPublishers(cps...))
72+
managed.WithConnectionPublishers(cps...),
73+
}
74+
75+
if o.Features.Enabled(features.EnableAlphaManagementPolicies) {
76+
opts = append(opts, managed.WithManagementPolicies())
77+
}
78+
79+
r := managed.NewReconciler(mgr, resource.ManagedKind(v1beta1.NetworkGroupVersionKind), opts...)
7580

7681
return ctrl.NewControllerManagedBy(mgr).
7782
Named(name).

‎pkg/controller/compute/router.go‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,20 @@ func SetupRouter(mgr ctrl.Manager, o controller.Options) error {
6060
cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), scv1alpha1.StoreConfigGroupVersionKind, connection.WithTLSConfig(o.ESSOptions.TLSConfig)))
6161
}
6262

63-
r := managed.NewReconciler(mgr,
64-
resource.ManagedKind(v1alpha1.RouterGroupVersionKind),
63+
opts := []managed.ReconcilerOption{
6564
managed.WithExternalConnecter(&routerConnector{kube: mgr.GetClient()}),
6665
managed.WithReferenceResolver(managed.NewAPISimpleReferenceResolver(mgr.GetClient())),
6766
managed.WithLogger(o.Logger.WithValues("controller", name)),
6867
managed.WithPollInterval(o.PollInterval),
6968
managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))),
70-
managed.WithConnectionPublishers(cps...))
69+
managed.WithConnectionPublishers(cps...),
70+
}
71+
72+
if o.Features.Enabled(features.EnableAlphaManagementPolicies) {
73+
opts = append(opts, managed.WithManagementPolicies())
74+
}
75+
76+
r := managed.NewReconciler(mgr, resource.ManagedKind(v1alpha1.RouterGroupVersionKind), opts...)
7177

7278
return ctrl.NewControllerManagedBy(mgr).
7379
Named(name).

‎pkg/controller/compute/subnetwork.go‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,19 @@ func SetupSubnetwork(mgr ctrl.Manager, o controller.Options) error {
6464
cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), scv1alpha1.StoreConfigGroupVersionKind, connection.WithTLSConfig(o.ESSOptions.TLSConfig)))
6565
}
6666

67-
r := managed.NewReconciler(mgr,
68-
resource.ManagedKind(v1beta1.SubnetworkGroupVersionKind),
67+
opts := []managed.ReconcilerOption{
6968
managed.WithExternalConnecter(&subnetworkConnector{kube: mgr.GetClient()}),
70-
managed.WithConnectionPublishers(),
7169
managed.WithPollInterval(o.PollInterval),
7270
managed.WithLogger(o.Logger.WithValues("controller", name)),
7371
managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))),
74-
managed.WithConnectionPublishers(cps...))
72+
managed.WithConnectionPublishers(cps...),
73+
}
74+
75+
if o.Features.Enabled(features.EnableAlphaManagementPolicies) {
76+
opts = append(opts, managed.WithManagementPolicies())
77+
}
78+
79+
r := managed.NewReconciler(mgr, resource.ManagedKind(v1beta1.SubnetworkGroupVersionKind), opts...)
7580

7681
return ctrl.NewControllerManagedBy(mgr).
7782
Named(name).

‎pkg/controller/container/cluster.go‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,19 @@ func SetupCluster(mgr ctrl.Manager, o controller.Options) error {
6464
cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), scv1alpha1.StoreConfigGroupVersionKind, connection.WithTLSConfig(o.ESSOptions.TLSConfig)))
6565
}
6666

67-
r := managed.NewReconciler(mgr,
68-
resource.ManagedKind(v1beta2.ClusterGroupVersionKind),
67+
opts := []managed.ReconcilerOption{
6968
managed.WithExternalConnecter(&clusterConnector{kube: mgr.GetClient()}),
7069
managed.WithPollInterval(o.PollInterval),
7170
managed.WithLogger(o.Logger.WithValues("controller", name)),
7271
managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))),
73-
managed.WithConnectionPublishers(cps...))
72+
managed.WithConnectionPublishers(cps...),
73+
}
74+
75+
if o.Features.Enabled(features.EnableAlphaManagementPolicies) {
76+
opts = append(opts, managed.WithManagementPolicies())
77+
}
78+
79+
r := managed.NewReconciler(mgr, resource.ManagedKind(v1beta2.ClusterGroupVersionKind), opts...)
7480

7581
return ctrl.NewControllerManagedBy(mgr).
7682
Named(name).

‎pkg/controller/container/nodepool.go‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,19 @@ func SetupNodePool(mgr ctrl.Manager, o controller.Options) error {
6262
cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), scv1alpha1.StoreConfigGroupVersionKind, connection.WithTLSConfig(o.ESSOptions.TLSConfig)))
6363
}
6464

65-
r := managed.NewReconciler(mgr,
66-
resource.ManagedKind(v1beta1.NodePoolGroupVersionKind),
65+
opts := []managed.ReconcilerOption{
6766
managed.WithExternalConnecter(&nodePoolConnector{kube: mgr.GetClient()}),
6867
managed.WithPollInterval(o.PollInterval),
6968
managed.WithLogger(o.Logger.WithValues("controller", name)),
7069
managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))),
71-
managed.WithConnectionPublishers(cps...))
70+
managed.WithConnectionPublishers(cps...),
71+
}
72+
73+
if o.Features.Enabled(features.EnableAlphaManagementPolicies) {
74+
opts = append(opts, managed.WithManagementPolicies())
75+
}
76+
77+
r := managed.NewReconciler(mgr, resource.ManagedKind(v1beta1.NodePoolGroupVersionKind), opts...)
7278

7379
return ctrl.NewControllerManagedBy(mgr).
7480
Named(name).

‎pkg/controller/database/cloudsql.go‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,20 @@ func SetupCloudSQLInstance(mgr ctrl.Manager, o controller.Options) error {
6767
cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), scv1alpha1.StoreConfigGroupVersionKind, connection.WithTLSConfig(o.ESSOptions.TLSConfig)))
6868
}
6969

70-
r := managed.NewReconciler(mgr,
71-
resource.ManagedKind(v1beta1.CloudSQLInstanceGroupVersionKind),
70+
opts := []managed.ReconcilerOption{
7271
managed.WithExternalConnecter(&cloudsqlConnector{kube: mgr.GetClient()}),
7372
managed.WithInitializers(managed.NewNameAsExternalName(mgr.GetClient()), &cloudsqlTagger{kube: mgr.GetClient()}),
7473
managed.WithPollInterval(o.PollInterval),
7574
managed.WithLogger(o.Logger.WithValues("controller", name)),
7675
managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))),
77-
managed.WithConnectionPublishers(cps...))
76+
managed.WithConnectionPublishers(cps...),
77+
}
78+
79+
if o.Features.Enabled(features.EnableAlphaManagementPolicies) {
80+
opts = append(opts, managed.WithManagementPolicies())
81+
}
82+
83+
r := managed.NewReconciler(mgr, resource.ManagedKind(v1beta1.CloudSQLInstanceGroupVersionKind), opts...)
7884

7985
return ctrl.NewControllerManagedBy(mgr).
8086
Named(name).

0 commit comments

Comments
 (0)