diff --git a/pkg/controller/cache/managed.go b/pkg/controller/cache/managed.go index 21d69c782..cf268c8ef 100644 --- a/pkg/controller/cache/managed.go +++ b/pkg/controller/cache/managed.go @@ -66,13 +66,19 @@ func SetupCloudMemorystoreInstance(mgr ctrl.Manager, o controller.Options) error cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), scv1alpha1.StoreConfigGroupVersionKind, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } - r := managed.NewReconciler(mgr, - resource.ManagedKind(v1beta1.CloudMemorystoreInstanceGroupVersionKind), + opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(&connecter{client: mgr.GetClient()}), managed.WithPollInterval(o.PollInterval), managed.WithLogger(o.Logger.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), - managed.WithConnectionPublishers(cps...)) + managed.WithConnectionPublishers(cps...), + } + + if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + opts = append(opts, managed.WithManagementPolicies()) + } + + r := managed.NewReconciler(mgr, resource.ManagedKind(v1beta1.CloudMemorystoreInstanceGroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). Named(name). diff --git a/pkg/controller/compute/address.go b/pkg/controller/compute/address.go index eaa01c255..f3eaf38df 100644 --- a/pkg/controller/compute/address.go +++ b/pkg/controller/compute/address.go @@ -59,14 +59,19 @@ func SetupAddress(mgr ctrl.Manager, o controller.Options) error { cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), scv1alpha1.StoreConfigGroupVersionKind, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } - r := managed.NewReconciler(mgr, - resource.ManagedKind(v1beta1.AddressGroupVersionKind), + opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(&addressConnector{kube: mgr.GetClient()}), - managed.WithConnectionPublishers(), managed.WithPollInterval(o.PollInterval), managed.WithLogger(o.Logger.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), - managed.WithConnectionPublishers(cps...)) + managed.WithConnectionPublishers(cps...), + } + + if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + opts = append(opts, managed.WithManagementPolicies()) + } + + r := managed.NewReconciler(mgr, resource.ManagedKind(v1beta1.AddressGroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). Named(name). diff --git a/pkg/controller/compute/firewall.go b/pkg/controller/compute/firewall.go index 2d83d72ed..09e8d7604 100644 --- a/pkg/controller/compute/firewall.go +++ b/pkg/controller/compute/firewall.go @@ -62,13 +62,19 @@ func SetupFirewall(mgr ctrl.Manager, o controller.Options) error { cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), scv1alpha1.StoreConfigGroupVersionKind, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } - r := managed.NewReconciler(mgr, - resource.ManagedKind(v1alpha1.FirewallGroupVersionKind), + opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(&firewallConnector{kube: mgr.GetClient()}), managed.WithLogger(o.Logger.WithValues("controller", name)), managed.WithPollInterval(o.PollInterval), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), - managed.WithConnectionPublishers(cps...)) + managed.WithConnectionPublishers(cps...), + } + + if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + opts = append(opts, managed.WithManagementPolicies()) + } + + r := managed.NewReconciler(mgr, resource.ManagedKind(v1alpha1.FirewallGroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). Named(name). diff --git a/pkg/controller/compute/globaladdress.go b/pkg/controller/compute/globaladdress.go index 7fe3e0ddf..17b563f13 100644 --- a/pkg/controller/compute/globaladdress.go +++ b/pkg/controller/compute/globaladdress.go @@ -60,14 +60,19 @@ func SetupGlobalAddress(mgr ctrl.Manager, o controller.Options) error { cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), scv1alpha1.StoreConfigGroupVersionKind, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } - r := managed.NewReconciler(mgr, - resource.ManagedKind(v1beta1.GlobalAddressGroupVersionKind), + opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(&gaConnector{kube: mgr.GetClient()}), - managed.WithConnectionPublishers(), managed.WithPollInterval(o.PollInterval), managed.WithLogger(o.Logger.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), - managed.WithConnectionPublishers(cps...)) + managed.WithConnectionPublishers(cps...), + } + + if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + opts = append(opts, managed.WithManagementPolicies()) + } + + r := managed.NewReconciler(mgr, resource.ManagedKind(v1beta1.GlobalAddressGroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). Named(name). diff --git a/pkg/controller/compute/network.go b/pkg/controller/compute/network.go index bedf05419..6bc0006a5 100644 --- a/pkg/controller/compute/network.go +++ b/pkg/controller/compute/network.go @@ -64,14 +64,19 @@ func SetupNetwork(mgr ctrl.Manager, o controller.Options) error { cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), scv1alpha1.StoreConfigGroupVersionKind, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } - r := managed.NewReconciler(mgr, - resource.ManagedKind(v1beta1.NetworkGroupVersionKind), + opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(&networkConnector{kube: mgr.GetClient()}), - managed.WithConnectionPublishers(), managed.WithPollInterval(o.PollInterval), managed.WithLogger(o.Logger.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), - managed.WithConnectionPublishers(cps...)) + managed.WithConnectionPublishers(cps...), + } + + if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + opts = append(opts, managed.WithManagementPolicies()) + } + + r := managed.NewReconciler(mgr, resource.ManagedKind(v1beta1.NetworkGroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). Named(name). diff --git a/pkg/controller/compute/router.go b/pkg/controller/compute/router.go index ff902e661..f5b020017 100644 --- a/pkg/controller/compute/router.go +++ b/pkg/controller/compute/router.go @@ -60,14 +60,20 @@ func SetupRouter(mgr ctrl.Manager, o controller.Options) error { cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), scv1alpha1.StoreConfigGroupVersionKind, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } - r := managed.NewReconciler(mgr, - resource.ManagedKind(v1alpha1.RouterGroupVersionKind), + opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(&routerConnector{kube: mgr.GetClient()}), managed.WithReferenceResolver(managed.NewAPISimpleReferenceResolver(mgr.GetClient())), managed.WithLogger(o.Logger.WithValues("controller", name)), managed.WithPollInterval(o.PollInterval), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), - managed.WithConnectionPublishers(cps...)) + managed.WithConnectionPublishers(cps...), + } + + if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + opts = append(opts, managed.WithManagementPolicies()) + } + + r := managed.NewReconciler(mgr, resource.ManagedKind(v1alpha1.RouterGroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). Named(name). diff --git a/pkg/controller/compute/subnetwork.go b/pkg/controller/compute/subnetwork.go index 7996cb164..b4d8ec4a7 100644 --- a/pkg/controller/compute/subnetwork.go +++ b/pkg/controller/compute/subnetwork.go @@ -64,14 +64,19 @@ func SetupSubnetwork(mgr ctrl.Manager, o controller.Options) error { cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), scv1alpha1.StoreConfigGroupVersionKind, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } - r := managed.NewReconciler(mgr, - resource.ManagedKind(v1beta1.SubnetworkGroupVersionKind), + opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(&subnetworkConnector{kube: mgr.GetClient()}), - managed.WithConnectionPublishers(), managed.WithPollInterval(o.PollInterval), managed.WithLogger(o.Logger.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), - managed.WithConnectionPublishers(cps...)) + managed.WithConnectionPublishers(cps...), + } + + if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + opts = append(opts, managed.WithManagementPolicies()) + } + + r := managed.NewReconciler(mgr, resource.ManagedKind(v1beta1.SubnetworkGroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). Named(name). diff --git a/pkg/controller/container/cluster.go b/pkg/controller/container/cluster.go index dd4e93cc2..e61da9569 100644 --- a/pkg/controller/container/cluster.go +++ b/pkg/controller/container/cluster.go @@ -64,13 +64,19 @@ func SetupCluster(mgr ctrl.Manager, o controller.Options) error { cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), scv1alpha1.StoreConfigGroupVersionKind, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } - r := managed.NewReconciler(mgr, - resource.ManagedKind(v1beta2.ClusterGroupVersionKind), + opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(&clusterConnector{kube: mgr.GetClient()}), managed.WithPollInterval(o.PollInterval), managed.WithLogger(o.Logger.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), - managed.WithConnectionPublishers(cps...)) + managed.WithConnectionPublishers(cps...), + } + + if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + opts = append(opts, managed.WithManagementPolicies()) + } + + r := managed.NewReconciler(mgr, resource.ManagedKind(v1beta2.ClusterGroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). Named(name). diff --git a/pkg/controller/container/nodepool.go b/pkg/controller/container/nodepool.go index 7fd952f78..ec8e1c04b 100644 --- a/pkg/controller/container/nodepool.go +++ b/pkg/controller/container/nodepool.go @@ -62,13 +62,19 @@ func SetupNodePool(mgr ctrl.Manager, o controller.Options) error { cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), scv1alpha1.StoreConfigGroupVersionKind, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } - r := managed.NewReconciler(mgr, - resource.ManagedKind(v1beta1.NodePoolGroupVersionKind), + opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(&nodePoolConnector{kube: mgr.GetClient()}), managed.WithPollInterval(o.PollInterval), managed.WithLogger(o.Logger.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), - managed.WithConnectionPublishers(cps...)) + managed.WithConnectionPublishers(cps...), + } + + if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + opts = append(opts, managed.WithManagementPolicies()) + } + + r := managed.NewReconciler(mgr, resource.ManagedKind(v1beta1.NodePoolGroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). Named(name). diff --git a/pkg/controller/database/cloudsql.go b/pkg/controller/database/cloudsql.go index c3c0092fb..fd2ffe5cd 100644 --- a/pkg/controller/database/cloudsql.go +++ b/pkg/controller/database/cloudsql.go @@ -67,14 +67,20 @@ func SetupCloudSQLInstance(mgr ctrl.Manager, o controller.Options) error { cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), scv1alpha1.StoreConfigGroupVersionKind, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } - r := managed.NewReconciler(mgr, - resource.ManagedKind(v1beta1.CloudSQLInstanceGroupVersionKind), + opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(&cloudsqlConnector{kube: mgr.GetClient()}), managed.WithInitializers(managed.NewNameAsExternalName(mgr.GetClient()), &cloudsqlTagger{kube: mgr.GetClient()}), managed.WithPollInterval(o.PollInterval), managed.WithLogger(o.Logger.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), - managed.WithConnectionPublishers(cps...)) + managed.WithConnectionPublishers(cps...), + } + + if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + opts = append(opts, managed.WithManagementPolicies()) + } + + r := managed.NewReconciler(mgr, resource.ManagedKind(v1beta1.CloudSQLInstanceGroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). Named(name). diff --git a/pkg/controller/dns/policy.go b/pkg/controller/dns/policy.go index c962326a8..21cdfe14e 100644 --- a/pkg/controller/dns/policy.go +++ b/pkg/controller/dns/policy.go @@ -58,14 +58,20 @@ func SetupPolicy(mgr ctrl.Manager, o controller.Options) error { cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), scv1alpha1.StoreConfigGroupVersionKind, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } - r := managed.NewReconciler(mgr, - resource.ManagedKind(v1alpha1.PolicyGroupVersionKind), + opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(&policyConnector{kube: mgr.GetClient()}), managed.WithInitializers(managed.NewNameAsExternalName(mgr.GetClient())), managed.WithPollInterval(o.PollInterval), managed.WithLogger(o.Logger.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), - managed.WithConnectionPublishers(cps...)) + managed.WithConnectionPublishers(cps...), + } + + if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + opts = append(opts, managed.WithManagementPolicies()) + } + + r := managed.NewReconciler(mgr, resource.ManagedKind(v1alpha1.PolicyGroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). Named(name). diff --git a/pkg/controller/dns/resource_record_set.go b/pkg/controller/dns/resource_record_set.go index 8c8ebb40f..957661bc7 100644 --- a/pkg/controller/dns/resource_record_set.go +++ b/pkg/controller/dns/resource_record_set.go @@ -61,14 +61,20 @@ func SetupResourceRecordSet(mgr ctrl.Manager, o controller.Options) error { cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), scv1alpha1.StoreConfigGroupVersionKind, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } - r := managed.NewReconciler(mgr, - resource.ManagedKind(v1alpha1.ResourceRecordSetGroupVersionKind), + opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(&connector{kube: mgr.GetClient()}), managed.WithInitializers(rrsclient.NewCustomNameAsExternalName(mgr.GetClient())), managed.WithPollInterval(o.PollInterval), managed.WithLogger(o.Logger.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), - managed.WithConnectionPublishers(cps...)) + managed.WithConnectionPublishers(cps...), + } + + if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + opts = append(opts, managed.WithManagementPolicies()) + } + + r := managed.NewReconciler(mgr, resource.ManagedKind(v1alpha1.ResourceRecordSetGroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). Named(name). diff --git a/pkg/controller/iam/serviceaccount.go b/pkg/controller/iam/serviceaccount.go index 9934fedaa..db3a5abbe 100644 --- a/pkg/controller/iam/serviceaccount.go +++ b/pkg/controller/iam/serviceaccount.go @@ -60,13 +60,19 @@ func SetupServiceAccount(mgr ctrl.Manager, o controller.Options) error { cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), scv1alpha1.StoreConfigGroupVersionKind, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } - r := managed.NewReconciler(mgr, - resource.ManagedKind(v1alpha1.ServiceAccountGroupVersionKind), + opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(&connecter{client: mgr.GetClient()}), managed.WithPollInterval(o.PollInterval), managed.WithLogger(o.Logger.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), - managed.WithConnectionPublishers(cps...)) + managed.WithConnectionPublishers(cps...), + } + + if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + opts = append(opts, managed.WithManagementPolicies()) + } + + r := managed.NewReconciler(mgr, resource.ManagedKind(v1alpha1.ServiceAccountGroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). Named(name). diff --git a/pkg/controller/iam/serviceaccountkey.go b/pkg/controller/iam/serviceaccountkey.go index b7333423f..9f78ba938 100644 --- a/pkg/controller/iam/serviceaccountkey.go +++ b/pkg/controller/iam/serviceaccountkey.go @@ -74,14 +74,20 @@ func SetupServiceAccountKey(mgr ctrl.Manager, o controller.Options) error { cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), scv1alpha1.StoreConfigGroupVersionKind, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } - r := managed.NewReconciler(mgr, - resource.ManagedKind(v1alpha1.ServiceAccountKeyGroupVersionKind), + opts := []managed.ReconcilerOption{ managed.WithInitializers(), managed.WithExternalConnecter(&serviceAccountKeyServiceConnector{client: mgr.GetClient()}), managed.WithPollInterval(o.PollInterval), managed.WithLogger(o.Logger.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), - managed.WithConnectionPublishers(cps...)) + managed.WithConnectionPublishers(cps...), + } + + if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + opts = append(opts, managed.WithManagementPolicies()) + } + + r := managed.NewReconciler(mgr, resource.ManagedKind(v1alpha1.ServiceAccountKeyGroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). Named(name). diff --git a/pkg/controller/iam/serviceaccountpolicy.go b/pkg/controller/iam/serviceaccountpolicy.go index 1c2191c18..cc1168f1c 100644 --- a/pkg/controller/iam/serviceaccountpolicy.go +++ b/pkg/controller/iam/serviceaccountpolicy.go @@ -56,13 +56,19 @@ func SetupServiceAccountPolicy(mgr ctrl.Manager, o controller.Options) error { cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), scv1alpha1.StoreConfigGroupVersionKind, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } - r := managed.NewReconciler(mgr, - resource.ManagedKind(v1alpha1.ServiceAccountPolicyGroupVersionKind), + opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(&serviceAccountPolicyConnecter{client: mgr.GetClient()}), managed.WithPollInterval(o.PollInterval), managed.WithLogger(o.Logger.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), - managed.WithConnectionPublishers(cps...)) + managed.WithConnectionPublishers(cps...), + } + + if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + opts = append(opts, managed.WithManagementPolicies()) + } + + r := managed.NewReconciler(mgr, resource.ManagedKind(v1alpha1.ServiceAccountPolicyGroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). Named(name). diff --git a/pkg/controller/kms/cryptokey.go b/pkg/controller/kms/cryptokey.go index 49bd05dba..c5ce07de8 100644 --- a/pkg/controller/kms/cryptokey.go +++ b/pkg/controller/kms/cryptokey.go @@ -56,13 +56,19 @@ func SetupCryptoKey(mgr ctrl.Manager, o controller.Options) error { cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), scv1alpha1.StoreConfigGroupVersionKind, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } - r := managed.NewReconciler(mgr, - resource.ManagedKind(v1alpha1.CryptoKeyGroupVersionKind), + opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(&cryptoKeyConnecter{client: mgr.GetClient()}), managed.WithPollInterval(o.PollInterval), managed.WithLogger(o.Logger.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), - managed.WithConnectionPublishers(cps...)) + managed.WithConnectionPublishers(cps...), + } + + if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + opts = append(opts, managed.WithManagementPolicies()) + } + + r := managed.NewReconciler(mgr, resource.ManagedKind(v1alpha1.CryptoKeyGroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). Named(name). diff --git a/pkg/controller/kms/cryptokeypolicy.go b/pkg/controller/kms/cryptokeypolicy.go index b6b85d98a..e3054a3ac 100644 --- a/pkg/controller/kms/cryptokeypolicy.go +++ b/pkg/controller/kms/cryptokeypolicy.go @@ -55,13 +55,19 @@ func SetupCryptoKeyPolicy(mgr ctrl.Manager, o controller.Options) error { cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), scv1alpha1.StoreConfigGroupVersionKind, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } - r := managed.NewReconciler(mgr, - resource.ManagedKind(v1alpha1.CryptoKeyPolicyGroupVersionKind), + opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(&cryptoKeyPolicyConnecter{client: mgr.GetClient()}), managed.WithPollInterval(o.PollInterval), managed.WithLogger(o.Logger.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), - managed.WithConnectionPublishers(cps...)) + managed.WithConnectionPublishers(cps...), + } + + if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + opts = append(opts, managed.WithManagementPolicies()) + } + + r := managed.NewReconciler(mgr, resource.ManagedKind(v1alpha1.CryptoKeyPolicyGroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). Named(name). diff --git a/pkg/controller/kms/keyring.go b/pkg/controller/kms/keyring.go index a3b978da8..7b91d6124 100644 --- a/pkg/controller/kms/keyring.go +++ b/pkg/controller/kms/keyring.go @@ -59,13 +59,19 @@ func SetupKeyRing(mgr ctrl.Manager, o controller.Options) error { cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), scv1alpha1.StoreConfigGroupVersionKind, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } - r := managed.NewReconciler(mgr, - resource.ManagedKind(v1alpha1.KeyRingGroupVersionKind), + opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(&keyRingConnecter{client: mgr.GetClient()}), managed.WithPollInterval(o.PollInterval), managed.WithLogger(o.Logger.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), - managed.WithConnectionPublishers(cps...)) + managed.WithConnectionPublishers(cps...), + } + + if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + opts = append(opts, managed.WithManagementPolicies()) + } + + r := managed.NewReconciler(mgr, resource.ManagedKind(v1alpha1.KeyRingGroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). Named(name). diff --git a/pkg/controller/pubsub/subscription.go b/pkg/controller/pubsub/subscription.go index e5124ac39..c1d4579c9 100644 --- a/pkg/controller/pubsub/subscription.go +++ b/pkg/controller/pubsub/subscription.go @@ -59,13 +59,19 @@ func SetupSubscription(mgr ctrl.Manager, o controller.Options) error { cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), scv1alpha1.StoreConfigGroupVersionKind, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } - r := managed.NewReconciler(mgr, - resource.ManagedKind(v1alpha1.SubscriptionGroupVersionKind), + opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(&subscriptionConnector{client: mgr.GetClient()}), managed.WithPollInterval(o.PollInterval), managed.WithLogger(o.Logger.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), - managed.WithConnectionPublishers(cps...)) + managed.WithConnectionPublishers(cps...), + } + + if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + opts = append(opts, managed.WithManagementPolicies()) + } + + r := managed.NewReconciler(mgr, resource.ManagedKind(v1alpha1.SubscriptionGroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). Named(name). diff --git a/pkg/controller/pubsub/topic.go b/pkg/controller/pubsub/topic.go index eac220cfd..8a206375b 100644 --- a/pkg/controller/pubsub/topic.go +++ b/pkg/controller/pubsub/topic.go @@ -60,13 +60,19 @@ func SetupTopic(mgr ctrl.Manager, o controller.Options) error { cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), scv1alpha1.StoreConfigGroupVersionKind, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } - r := managed.NewReconciler(mgr, - resource.ManagedKind(v1alpha1.TopicGroupVersionKind), + opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(&connector{client: mgr.GetClient()}), managed.WithPollInterval(o.PollInterval), managed.WithLogger(o.Logger.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), - managed.WithConnectionPublishers(cps...)) + managed.WithConnectionPublishers(cps...), + } + + if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + opts = append(opts, managed.WithManagementPolicies()) + } + + r := managed.NewReconciler(mgr, resource.ManagedKind(v1alpha1.TopicGroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). Named(name). diff --git a/pkg/controller/registry/containerregistry.go b/pkg/controller/registry/containerregistry.go index acea42b0b..b86ad4de0 100644 --- a/pkg/controller/registry/containerregistry.go +++ b/pkg/controller/registry/containerregistry.go @@ -67,13 +67,19 @@ func SetupContainerRegistry(mgr ctrl.Manager, o controller.Options) error { cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), scv1alpha1.StoreConfigGroupVersionKind, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } - r := managed.NewReconciler(mgr, - resource.ManagedKind(v1alpha1.ContainerRegistryGroupVersionKind), + opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(&connecter{client: mgr.GetClient()}), managed.WithPollInterval(o.PollInterval), managed.WithLogger(o.Logger.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), - managed.WithConnectionPublishers(cps...)) + managed.WithConnectionPublishers(cps...), + } + + if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + opts = append(opts, managed.WithManagementPolicies()) + } + + r := managed.NewReconciler(mgr, resource.ManagedKind(v1alpha1.ContainerRegistryGroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). Named(name). diff --git a/pkg/controller/servicenetworking/connection.go b/pkg/controller/servicenetworking/connection.go index 4415bc791..7c5d1d0e5 100644 --- a/pkg/controller/servicenetworking/connection.go +++ b/pkg/controller/servicenetworking/connection.go @@ -84,14 +84,19 @@ func SetupConnection(mgr ctrl.Manager, o controller.Options) error { cps = append(cps, xpconnection.NewDetailsManager(mgr.GetClient(), scv1alpha1.StoreConfigGroupVersionKind, xpconnection.WithTLSConfig(o.ESSOptions.TLSConfig))) } - r := managed.NewReconciler(mgr, - resource.ManagedKind(v1beta1.ConnectionGroupVersionKind), + opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(&connector{client: mgr.GetClient()}), - managed.WithConnectionPublishers(), managed.WithPollInterval(o.PollInterval), managed.WithLogger(o.Logger.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), - managed.WithConnectionPublishers(cps...)) + managed.WithConnectionPublishers(cps...), + } + + if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + opts = append(opts, managed.WithManagementPolicies()) + } + + r := managed.NewReconciler(mgr, resource.ManagedKind(v1beta1.ConnectionGroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). Named(name). diff --git a/pkg/controller/storage/bucket.go b/pkg/controller/storage/bucket.go index f14880601..6a17d4d0b 100644 --- a/pkg/controller/storage/bucket.go +++ b/pkg/controller/storage/bucket.go @@ -61,13 +61,19 @@ func SetupBucket(mgr ctrl.Manager, o controller.Options) error { cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), scv1alpha1.StoreConfigGroupVersionKind, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } - r := managed.NewReconciler(mgr, - resource.ManagedKind(v1alpha3.BucketGroupVersionKind), + opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(&connecter{client: mgr.GetClient()}), managed.WithPollInterval(o.PollInterval), managed.WithLogger(o.Logger.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), - managed.WithConnectionPublishers(cps...)) + managed.WithConnectionPublishers(cps...), + } + + if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + opts = append(opts, managed.WithManagementPolicies()) + } + + r := managed.NewReconciler(mgr, resource.ManagedKind(v1alpha3.BucketGroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). Named(name). diff --git a/pkg/controller/storage/bucketpolicy.go b/pkg/controller/storage/bucketpolicy.go index b31a5cbb7..5d7837c78 100644 --- a/pkg/controller/storage/bucketpolicy.go +++ b/pkg/controller/storage/bucketpolicy.go @@ -56,14 +56,20 @@ func SetupBucketPolicy(mgr ctrl.Manager, o controller.Options) error { cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), scv1alpha1.StoreConfigGroupVersionKind, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } - r := managed.NewReconciler(mgr, - resource.ManagedKind(v1alpha1.BucketPolicyGroupVersionKind), + opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(&bucketPolicyConnecter{client: mgr.GetClient()}), managed.WithReferenceResolver(managed.NewAPISimpleReferenceResolver(mgr.GetClient())), managed.WithPollInterval(o.PollInterval), managed.WithLogger(o.Logger.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), - managed.WithConnectionPublishers(cps...)) + managed.WithConnectionPublishers(cps...), + } + + if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + opts = append(opts, managed.WithManagementPolicies()) + } + + r := managed.NewReconciler(mgr, resource.ManagedKind(v1alpha1.BucketPolicyGroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). Named(name). diff --git a/pkg/controller/storage/bucketpolicymember.go b/pkg/controller/storage/bucketpolicymember.go index 1cb3e8bed..25f5e2c0e 100644 --- a/pkg/controller/storage/bucketpolicymember.go +++ b/pkg/controller/storage/bucketpolicymember.go @@ -53,13 +53,19 @@ func SetupBucketPolicyMember(mgr ctrl.Manager, o controller.Options) error { cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), scv1alpha1.StoreConfigGroupVersionKind, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } - r := managed.NewReconciler(mgr, - resource.ManagedKind(v1alpha1.BucketPolicyMemberGroupVersionKind), + opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(&bucketPolicyMemberConnecter{client: mgr.GetClient()}), managed.WithPollInterval(o.PollInterval), managed.WithLogger(o.Logger.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), - managed.WithConnectionPublishers(cps...)) + managed.WithConnectionPublishers(cps...), + } + + if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + opts = append(opts, managed.WithManagementPolicies()) + } + + r := managed.NewReconciler(mgr, resource.ManagedKind(v1alpha1.BucketPolicyMemberGroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). Named(name).