Skip to content

fix: pass ProviderConfigUsage cleaner to managed reconcilers #482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fernandezcuesta wants to merge 2 commits into from
Open

fix: pass ProviderConfigUsage cleaner to managed reconcilers #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1e9ce7
fix: pass ProviderConfigUsage cleaner to managed reconcilers
fernandezcuesta Oct 8, 2026
8b2737a
fix: missing crossplane-runtime improvements
fernandezcuesta Oct 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion cmd/provider/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (

"github.com/alecthomas/kingpin/v2"
"github.com/go-logr/logr"
corev1 "k8s.io/api/core/v1"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
ctrl "sigs.k8s.io/controller-runtime"
Expand Down Expand Up @@ -58,6 +59,7 @@ func main() {
enableManagementPolicies = app.Flag("enable-management-policies", "Enable/disable support for Management Policies.").Default("true").Envar("ENABLE_MANAGEMENT_POLICIES").Bool()
pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval.").Default("5s").Duration()
metricsBindAddress = app.Flag("metrics-bind-address", "The address the metrics endpoint binds to.").Default(":8080").String()
enableSecretCache = app.Flag("enable-secret-cache", "Cache Secrets in memory. Disable to read Secrets directly from the API server, trading API requests for a smaller memory footprint.").Default("true").Envar("ENABLE_SECRET_CACHE").Bool()
)
kingpin.MustParse(app.Parse(os.Args[1:]))

Expand Down Expand Up @@ -85,12 +87,19 @@ func main() {
kingpin.FatalIfError(apis.AddToScheme(scheme), "Cannot add SQL APIs to scheme")
kingpin.FatalIfError(apiextensionsv1.AddToScheme(scheme), "Cannot register k8s apiextensions APIs to scheme")

var clientOpts ctrlclient.Options
if !*enableSecretCache {
clientOpts.Cache = &ctrlclient.CacheOptions{DisableFor: []ctrlclient.Object{&corev1.Secret{}}}
}

mgr, err := ctrl.NewManager(cfg, ctrl.Options{
Scheme: scheme,
Client: clientOpts,
LeaderElection: *leaderElection,
LeaderElectionID: "crossplane-leader-election-provider-sql",
Cache: cache.Options{
SyncPeriod: syncPeriod,
SyncPeriod: syncPeriod,
DefaultTransform: cache.TransformStripManagedFields(),
ByObject: map[ctrlclient.Object]cache.ByObject{
&apiextensionsv1.CustomResourceDefinition{}: {
Transform: customresourcesgate.TransformStripCRDSchema,
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/cluster/mssql/database/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ func Setup(mgr ctrl.Manager, o xpcontroller.Options) error {

reconcilerOptions := []managed.ReconcilerOption{
managed.WithTypedExternalConnector(&connector{kube: mgr.GetClient(), track: t.Track, newClient: mssql.New}),
managed.WithProviderConfigUsageCleaner(t),
managed.WithLogger(o.Logger.WithValues("controller", name)),
managed.WithPollInterval(o.PollInterval),
managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/cluster/mssql/grant/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ func Setup(mgr ctrl.Manager, o xpcontroller.Options) error {

reconcilerOptions := []managed.ReconcilerOption{
managed.WithTypedExternalConnector(&connector{kube: mgr.GetClient(), track: t.Track, newClient: mssql.New}),
managed.WithProviderConfigUsageCleaner(t),
managed.WithReferenceResolver(managed.NewAPISimpleReferenceResolver(mgr.GetClient())),
managed.WithLogger(o.Logger.WithValues("controller", name)),
managed.WithPollInterval(o.PollInterval),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/cluster/mssql/user/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ func Setup(mgr ctrl.Manager, o xpcontroller.Options) error {

reconcilerOptions := []managed.ReconcilerOption{
managed.WithTypedExternalConnector(&connector{kube: mgr.GetClient(), track: t.Track, newClient: mssql.New}),
managed.WithProviderConfigUsageCleaner(t),
managed.WithLogger(o.Logger.WithValues("controller", name)),
managed.WithPollInterval(o.PollInterval),
managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/cluster/mysql/database/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ func Setup(mgr ctrl.Manager, o xpcontroller.Options) error {

reconcilerOptions := []managed.ReconcilerOption{
managed.WithTypedExternalConnector(&connector{kube: mgr.GetClient(), track: t.Track, newDB: mysql.New}),
managed.WithProviderConfigUsageCleaner(t),
managed.WithLogger(o.Logger.WithValues("controller", name)),
managed.WithPollInterval(o.PollInterval),
managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/cluster/mysql/grant/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ func Setup(mgr ctrl.Manager, o xpcontroller.Options) error {

reconcilerOptions := []managed.ReconcilerOption{
managed.WithTypedExternalConnector(&connector{kube: mgr.GetClient(), track: t.Track, newDB: mysql.New}),
managed.WithProviderConfigUsageCleaner(t),
managed.WithReferenceResolver(managed.NewAPISimpleReferenceResolver(mgr.GetClient())),
managed.WithLogger(o.Logger.WithValues("controller", name)),
managed.WithPollInterval(o.PollInterval),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/cluster/mysql/user/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ func Setup(mgr ctrl.Manager, o xpcontroller.Options) error {

reconcilerOptions := []managed.ReconcilerOption{
managed.WithTypedExternalConnector(&connector{kube: mgr.GetClient(), track: t.Track, newDB: mysql.New}),
managed.WithProviderConfigUsageCleaner(t),
managed.WithLogger(o.Logger.WithValues("controller", name)),
managed.WithPollInterval(o.PollInterval),
managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/cluster/postgresql/database/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ func Setup(mgr ctrl.Manager, o xpcontroller.Options) error {

reconcilerOptions := []managed.ReconcilerOption{
managed.WithTypedExternalConnector(&connector{kube: mgr.GetClient(), track: t.Track, newDB: postgresql.New}),
managed.WithProviderConfigUsageCleaner(t),
managed.WithLogger(o.Logger.WithValues("controller", name)),
managed.WithPollInterval(o.PollInterval),
managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/cluster/postgresql/default_privileges/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ func Setup(mgr ctrl.Manager, o xpcontroller.Options) error {

reconcilerOptions := []managed.ReconcilerOption{
managed.WithTypedExternalConnector(&connector{kube: mgr.GetClient(), track: t.Track, newDB: postgresql.New}),
managed.WithProviderConfigUsageCleaner(t),
managed.WithLogger(o.Logger.WithValues("controller", name)),
managed.WithPollInterval(o.PollInterval),
managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/cluster/postgresql/extension/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ func Setup(mgr ctrl.Manager, o xpcontroller.Options) error {

reconcilerOptions := []managed.ReconcilerOption{
managed.WithTypedExternalConnector(&connector{kube: mgr.GetClient(), track: t.Track, newDB: postgresql.New}),
managed.WithProviderConfigUsageCleaner(t),
managed.WithLogger(o.Logger.WithValues("controller", name)),
managed.WithPollInterval(o.PollInterval),
managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/cluster/postgresql/grant/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1177,6 +1177,7 @@ func Setup(mgr ctrl.Manager, o xpcontroller.Options) error {

reconcilerOptions := []managed.ReconcilerOption{
managed.WithTypedExternalConnector(&connector{kube: mgr.GetClient(), log: o.Logger.WithValues("controller", name), track: t.Track, newDB: postgresql.New}),
managed.WithProviderConfigUsageCleaner(t),
managed.WithLogger(o.Logger.WithValues("controller", name)),
managed.WithPollInterval(o.PollInterval),
managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/cluster/postgresql/role/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ func Setup(mgr ctrl.Manager, o xpcontroller.Options) error {

reconcilerOptions := []managed.ReconcilerOption{
managed.WithTypedExternalConnector(&connector{kube: mgr.GetClient(), apiReader: mgr.GetAPIReader(), track: t.Track, newDB: postgresql.New}),
managed.WithProviderConfigUsageCleaner(t),
managed.WithLogger(o.Logger.WithValues("controller", name)),
managed.WithPollInterval(o.PollInterval),
managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/cluster/postgresql/schema/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ func Setup(mgr ctrl.Manager, o xpcontroller.Options) error {

reconcilerOptions := []managed.ReconcilerOption{
managed.WithTypedExternalConnector(&connector{kube: mgr.GetClient(), track: t.Track, newDB: postgresql.New}),
managed.WithProviderConfigUsageCleaner(t),
managed.WithLogger(o.Logger.WithValues("controller", name)),
managed.WithPollInterval(o.PollInterval),
managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/namespaced/mssql/database/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ func Setup(mgr ctrl.Manager, o xpcontroller.Options) error {

reconcilerOptions := []managed.ReconcilerOption{
managed.WithTypedExternalConnector(&connector{kube: mgr.GetClient(), track: t.Track, newClient: mssql.New}),
managed.WithProviderConfigUsageCleaner(t),
managed.WithLogger(o.Logger.WithValues("controller", name)),
managed.WithPollInterval(o.PollInterval),
managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/namespaced/mssql/grant/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ func Setup(mgr ctrl.Manager, o xpcontroller.Options) error {

reconcilerOptions := []managed.ReconcilerOption{
managed.WithTypedExternalConnector(&connector{kube: mgr.GetClient(), track: t.Track, newClient: mssql.New}),
managed.WithProviderConfigUsageCleaner(t),
managed.WithReferenceResolver(managed.NewAPISimpleReferenceResolver(mgr.GetClient())),
managed.WithLogger(o.Logger.WithValues("controller", name)),
managed.WithPollInterval(o.PollInterval),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/namespaced/mssql/user/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ func Setup(mgr ctrl.Manager, o xpcontroller.Options) error {

reconcilerOptions := []managed.ReconcilerOption{
managed.WithTypedExternalConnector(&connector{kube: mgr.GetClient(), track: t.Track, newClient: mssql.New}),
managed.WithProviderConfigUsageCleaner(t),
managed.WithLogger(o.Logger.WithValues("controller", name)),
managed.WithPollInterval(o.PollInterval),
managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/namespaced/mysql/database/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ func Setup(mgr ctrl.Manager, o xpcontroller.Options) error {

reconcilerOptions := []managed.ReconcilerOption{
managed.WithTypedExternalConnector(&connector{kube: mgr.GetClient(), track: t.Track, newDB: mysql.New}),
managed.WithProviderConfigUsageCleaner(t),
managed.WithLogger(o.Logger.WithValues("controller", name)),
managed.WithPollInterval(o.PollInterval),
managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/namespaced/mysql/grant/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ func Setup(mgr ctrl.Manager, o xpcontroller.Options) error {

reconcilerOptions := []managed.ReconcilerOption{
managed.WithTypedExternalConnector(&connector{kube: mgr.GetClient(), track: t.Track, newDB: mysql.New}),
managed.WithProviderConfigUsageCleaner(t),
managed.WithReferenceResolver(managed.NewAPISimpleReferenceResolver(mgr.GetClient())),
managed.WithLogger(o.Logger.WithValues("controller", name)),
managed.WithPollInterval(o.PollInterval),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/namespaced/mysql/user/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ func Setup(mgr ctrl.Manager, o xpcontroller.Options) error {

reconcilerOptions := []managed.ReconcilerOption{
managed.WithTypedExternalConnector(&connector{kube: mgr.GetClient(), track: t.Track, newDB: mysql.New}),
managed.WithProviderConfigUsageCleaner(t),
managed.WithLogger(o.Logger.WithValues("controller", name)),
managed.WithPollInterval(o.PollInterval),
managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/namespaced/postgresql/database/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ func Setup(mgr ctrl.Manager, o xpcontroller.Options) error {

reconcilerOptions := []managed.ReconcilerOption{
managed.WithTypedExternalConnector(&connector{kube: mgr.GetClient(), track: t.Track, newDB: postgresql.New}),
managed.WithProviderConfigUsageCleaner(t),
managed.WithLogger(o.Logger.WithValues("controller", name)),
managed.WithPollInterval(o.PollInterval),
managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/namespaced/postgresql/default_privileges/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ func Setup(mgr ctrl.Manager, o xpcontroller.Options) error {

reconcilerOptions := []managed.ReconcilerOption{
managed.WithTypedExternalConnector(&connector{kube: mgr.GetClient(), track: t.Track, newDB: postgresql.New}),
managed.WithProviderConfigUsageCleaner(t),
managed.WithLogger(o.Logger.WithValues("controller", name)),
managed.WithPollInterval(o.PollInterval),
managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/namespaced/postgresql/extension/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ func Setup(mgr ctrl.Manager, o xpcontroller.Options) error {

reconcilerOptions := []managed.ReconcilerOption{
managed.WithTypedExternalConnector(&connector{kube: mgr.GetClient(), track: t.Track, newDB: postgresql.New}),
managed.WithProviderConfigUsageCleaner(t),
managed.WithLogger(o.Logger.WithValues("controller", name)),
managed.WithPollInterval(o.PollInterval),
managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/namespaced/postgresql/grant/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1128,6 +1128,7 @@ func Setup(mgr ctrl.Manager, o xpcontroller.Options) error {

reconcilerOptions := []managed.ReconcilerOption{
managed.WithTypedExternalConnector(&connector{kube: mgr.GetClient(), log: o.Logger.WithValues("controller", name), track: t.Track, newDB: postgresql.New}),
managed.WithProviderConfigUsageCleaner(t),
managed.WithLogger(o.Logger.WithValues("controller", name)),
managed.WithPollInterval(o.PollInterval),
managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/namespaced/postgresql/role/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ func Setup(mgr ctrl.Manager, o xpcontroller.Options) error {

reconcilerOptions := []managed.ReconcilerOption{
managed.WithTypedExternalConnector(&connector{kube: mgr.GetClient(), apiReader: mgr.GetAPIReader(), track: t.Track, newDB: postgresql.New}),
managed.WithProviderConfigUsageCleaner(t),
managed.WithLogger(o.Logger.WithValues("controller", name)),
managed.WithPollInterval(o.PollInterval),
managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/namespaced/postgresql/schema/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ func Setup(mgr ctrl.Manager, o xpcontroller.Options) error {

reconcilerOptions := []managed.ReconcilerOption{
managed.WithTypedExternalConnector(&connector{kube: mgr.GetClient(), track: t.Track, newDB: postgresql.New}),
managed.WithProviderConfigUsageCleaner(t),
managed.WithLogger(o.Logger.WithValues("controller", name)),
managed.WithPollInterval(o.PollInterval),
managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))),
Expand Down