diff --git a/cmd/provider/main.go b/cmd/provider/main.go index 0463d93..8c9b812 100644 --- a/cmd/provider/main.go +++ b/cmd/provider/main.go @@ -65,7 +65,7 @@ func main() { pollInterval = app.Flag("poll", "How often individual resources will be checked for drift from the desired state").Default("1m").Duration() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may checked for drift from the desired state.").Default("10").Int() - enableManagementPolicies = app.Flag("enable-management-policies", "Enable support for Management Policies.").Default("false").Envar("ENABLE_MANAGEMENT_POLICIES").Bool() + enableManagementPolicies = app.Flag("enable-management-policies", "Enable support for Management Policies. Enabled by default; set to false to opt out.").Default("true").Envar("ENABLE_MANAGEMENT_POLICIES").Bool() enableSecretCache = app.Flag("enable-secret-cache", "Enable caching of Secret objects. When true, Secrets are served from the informer cache instead of direct API calls. This reduces API server load but increases memory usage.").Default("true").Envar("ENABLE_SECRET_CACHE").Bool() ) kingpin.MustParse(app.Parse(os.Args[1:])) @@ -121,8 +121,8 @@ func main() { } if *enableManagementPolicies { - o.Features.Enable(features.EnableAlphaManagementPolicies) - logger.Info("Alpha feature enabled", "flag", features.EnableAlphaManagementPolicies) + o.Features.Enable(features.EnableManagementPolicies) + logger.Info("Feature enabled", "flag", features.EnableManagementPolicies) } kingpin.FatalIfError(upbound.Setup(mgr, o), "Cannot setup Upbound controllers") diff --git a/internal/controller/cluster/repository/setup.go b/internal/controller/cluster/repository/setup.go index abb6dda..4843b34 100644 --- a/internal/controller/cluster/repository/setup.go +++ b/internal/controller/cluster/repository/setup.go @@ -56,7 +56,7 @@ func setup(mgr ctrl.Manager, o xpcontroller.Options) error { managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), } - if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + if o.Features.Enabled(features.EnableManagementPolicies) { reconcilerOpts = append(reconcilerOpts, managed.WithManagementPolicies()) } diff --git a/internal/controller/cluster/repositorypermission/setup.go b/internal/controller/cluster/repositorypermission/setup.go index 2f3ba64..441fe10 100644 --- a/internal/controller/cluster/repositorypermission/setup.go +++ b/internal/controller/cluster/repositorypermission/setup.go @@ -55,7 +55,7 @@ func setup(mgr ctrl.Manager, o xpcontroller.Options) error { managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), } - if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + if o.Features.Enabled(features.EnableManagementPolicies) { reconcilerOpts = append(reconcilerOpts, managed.WithManagementPolicies()) } diff --git a/internal/controller/cluster/robot/setup.go b/internal/controller/cluster/robot/setup.go index 8a64c8a..a403c1a 100644 --- a/internal/controller/cluster/robot/setup.go +++ b/internal/controller/cluster/robot/setup.go @@ -55,7 +55,7 @@ func setup(mgr ctrl.Manager, o xpcontroller.Options) error { managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), } - if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + if o.Features.Enabled(features.EnableManagementPolicies) { reconcilerOpts = append(reconcilerOpts, managed.WithManagementPolicies()) } diff --git a/internal/controller/cluster/robotteammembership/setup.go b/internal/controller/cluster/robotteammembership/setup.go index 66d87d7..992d98a 100644 --- a/internal/controller/cluster/robotteammembership/setup.go +++ b/internal/controller/cluster/robotteammembership/setup.go @@ -55,7 +55,7 @@ func setup(mgr ctrl.Manager, o xpcontroller.Options) error { managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), } - if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + if o.Features.Enabled(features.EnableManagementPolicies) { reconcilerOpts = append(reconcilerOpts, managed.WithManagementPolicies()) } diff --git a/internal/controller/cluster/team/setup.go b/internal/controller/cluster/team/setup.go index cdb38ed..ac3a068 100644 --- a/internal/controller/cluster/team/setup.go +++ b/internal/controller/cluster/team/setup.go @@ -55,7 +55,7 @@ func setup(mgr ctrl.Manager, o xpcontroller.Options) error { managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), } - if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + if o.Features.Enabled(features.EnableManagementPolicies) { reconcilerOpts = append(reconcilerOpts, managed.WithManagementPolicies()) } diff --git a/internal/controller/cluster/token/setup.go b/internal/controller/cluster/token/setup.go index 4967299..99e0617 100644 --- a/internal/controller/cluster/token/setup.go +++ b/internal/controller/cluster/token/setup.go @@ -55,7 +55,7 @@ func setup(mgr ctrl.Manager, o xpcontroller.Options) error { managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), } - if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + if o.Features.Enabled(features.EnableManagementPolicies) { reconcilerOpts = append(reconcilerOpts, managed.WithManagementPolicies()) } diff --git a/internal/controller/namespaced/repository/setup.go b/internal/controller/namespaced/repository/setup.go index f80d210..c8cd450 100644 --- a/internal/controller/namespaced/repository/setup.go +++ b/internal/controller/namespaced/repository/setup.go @@ -54,7 +54,7 @@ func setup(mgr ctrl.Manager, o xpcontroller.Options) error { managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), } - if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + if o.Features.Enabled(features.EnableManagementPolicies) { reconcilerOpts = append(reconcilerOpts, managed.WithManagementPolicies()) } diff --git a/internal/controller/namespaced/repositorypermission/setup.go b/internal/controller/namespaced/repositorypermission/setup.go index 9ecff17..529aad5 100644 --- a/internal/controller/namespaced/repositorypermission/setup.go +++ b/internal/controller/namespaced/repositorypermission/setup.go @@ -52,7 +52,7 @@ func setup(mgr ctrl.Manager, o xpcontroller.Options) error { managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), } - if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + if o.Features.Enabled(features.EnableManagementPolicies) { reconcilerOpts = append(reconcilerOpts, managed.WithManagementPolicies()) } diff --git a/internal/controller/namespaced/robot/setup.go b/internal/controller/namespaced/robot/setup.go index b792e4e..7e4b66c 100644 --- a/internal/controller/namespaced/robot/setup.go +++ b/internal/controller/namespaced/robot/setup.go @@ -53,7 +53,7 @@ func setup(mgr ctrl.Manager, o xpcontroller.Options) error { managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), } - if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + if o.Features.Enabled(features.EnableManagementPolicies) { reconcilerOpts = append(reconcilerOpts, managed.WithManagementPolicies()) } diff --git a/internal/controller/namespaced/robotteammembership/setup.go b/internal/controller/namespaced/robotteammembership/setup.go index dca5331..e4abc96 100644 --- a/internal/controller/namespaced/robotteammembership/setup.go +++ b/internal/controller/namespaced/robotteammembership/setup.go @@ -53,7 +53,7 @@ func setup(mgr ctrl.Manager, o xpcontroller.Options) error { managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), } - if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + if o.Features.Enabled(features.EnableManagementPolicies) { reconcilerOpts = append(reconcilerOpts, managed.WithManagementPolicies()) } diff --git a/internal/controller/namespaced/team/setup.go b/internal/controller/namespaced/team/setup.go index a8296d0..6c1f538 100644 --- a/internal/controller/namespaced/team/setup.go +++ b/internal/controller/namespaced/team/setup.go @@ -53,7 +53,7 @@ func setup(mgr ctrl.Manager, o xpcontroller.Options) error { managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), } - if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + if o.Features.Enabled(features.EnableManagementPolicies) { reconcilerOpts = append(reconcilerOpts, managed.WithManagementPolicies()) } diff --git a/internal/controller/namespaced/token/setup.go b/internal/controller/namespaced/token/setup.go index 6a88a2b..917d0d9 100644 --- a/internal/controller/namespaced/token/setup.go +++ b/internal/controller/namespaced/token/setup.go @@ -53,7 +53,7 @@ func setup(mgr ctrl.Manager, o xpcontroller.Options) error { managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))), } - if o.Features.Enabled(features.EnableAlphaManagementPolicies) { + if o.Features.Enabled(features.EnableManagementPolicies) { reconcilerOpts = append(reconcilerOpts, managed.WithManagementPolicies()) } diff --git a/internal/features/features.go b/internal/features/features.go index e93e58b..2224efa 100644 --- a/internal/features/features.go +++ b/internal/features/features.go @@ -20,8 +20,10 @@ import "github.com/crossplane/crossplane-runtime/v2/pkg/feature" // Feature flags. const ( - // EnableAlphaManagementPolicies enables alpha support for - // Management Policies. See the below design for more details. + // EnableManagementPolicies enables support for Management Policies. + // Management Policies are a stable Crossplane feature and this is enabled + // by default; it can be turned off with --enable-management-policies=false. + // See the below design for more details. // https://github.com/crossplane/crossplane/pull/3531 - EnableAlphaManagementPolicies feature.Flag = "EnableAlphaManagementPolicies" + EnableManagementPolicies feature.Flag = "EnableManagementPolicies" )