diff --git a/cmd/generator/main.go b/cmd/generator/main.go index 632b8ac0af..611050066e 100644 --- a/cmd/generator/main.go +++ b/cmd/generator/main.go @@ -33,7 +33,7 @@ func main() { if err != nil { panic(fmt.Sprintf("cannot calculate the absolute path with %s", *repoRoot)) } - p, err := config.GetProvider(context.Background(), true) + p, err := config.GetProvider(context.Background(), true, false) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") dumpGeneratedResourceList(p, generatedResourceList) dumpSkippedResourcesCSV(p, skippedResourcesCSV) diff --git a/cmd/provider/accessanalyzer/zz_main.go b/cmd/provider/accessanalyzer/zz_main.go index 203317699f..1b3453d2d3 100644 --- a/cmd/provider/accessanalyzer/zz_main.go +++ b/cmd/provider/accessanalyzer/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/account/zz_main.go b/cmd/provider/account/zz_main.go index b5dc863e5f..998f92aa71 100644 --- a/cmd/provider/account/zz_main.go +++ b/cmd/provider/account/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/acm/zz_main.go b/cmd/provider/acm/zz_main.go index 377dc08369..a715de4bf2 100644 --- a/cmd/provider/acm/zz_main.go +++ b/cmd/provider/acm/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/acmpca/zz_main.go b/cmd/provider/acmpca/zz_main.go index be86d8aa1b..ecad063aea 100644 --- a/cmd/provider/acmpca/zz_main.go +++ b/cmd/provider/acmpca/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/amp/zz_main.go b/cmd/provider/amp/zz_main.go index 73c23ed794..bc58475678 100644 --- a/cmd/provider/amp/zz_main.go +++ b/cmd/provider/amp/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/amplify/zz_main.go b/cmd/provider/amplify/zz_main.go index a067a471f9..c4fef5ddd7 100644 --- a/cmd/provider/amplify/zz_main.go +++ b/cmd/provider/amplify/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/apigateway/zz_main.go b/cmd/provider/apigateway/zz_main.go index e989935158..582d472c61 100644 --- a/cmd/provider/apigateway/zz_main.go +++ b/cmd/provider/apigateway/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/apigatewayv2/zz_main.go b/cmd/provider/apigatewayv2/zz_main.go index 6c74802c81..4a25b4f9e1 100644 --- a/cmd/provider/apigatewayv2/zz_main.go +++ b/cmd/provider/apigatewayv2/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/appautoscaling/zz_main.go b/cmd/provider/appautoscaling/zz_main.go index 65b7d49c24..82f426b921 100644 --- a/cmd/provider/appautoscaling/zz_main.go +++ b/cmd/provider/appautoscaling/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/appconfig/zz_main.go b/cmd/provider/appconfig/zz_main.go index 5aa7aa0253..33d64e0e13 100644 --- a/cmd/provider/appconfig/zz_main.go +++ b/cmd/provider/appconfig/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/appflow/zz_main.go b/cmd/provider/appflow/zz_main.go index 8874cae8e5..08f0727efb 100644 --- a/cmd/provider/appflow/zz_main.go +++ b/cmd/provider/appflow/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/appintegrations/zz_main.go b/cmd/provider/appintegrations/zz_main.go index e33587be86..ccd895e9ab 100644 --- a/cmd/provider/appintegrations/zz_main.go +++ b/cmd/provider/appintegrations/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/applicationinsights/zz_main.go b/cmd/provider/applicationinsights/zz_main.go index 5ed11550f8..e70ff8c338 100644 --- a/cmd/provider/applicationinsights/zz_main.go +++ b/cmd/provider/applicationinsights/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/appmesh/zz_main.go b/cmd/provider/appmesh/zz_main.go index c479e0d919..399b161f8c 100644 --- a/cmd/provider/appmesh/zz_main.go +++ b/cmd/provider/appmesh/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/apprunner/zz_main.go b/cmd/provider/apprunner/zz_main.go index 1dbdeca8ac..bc1e4fe09d 100644 --- a/cmd/provider/apprunner/zz_main.go +++ b/cmd/provider/apprunner/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/appstream/zz_main.go b/cmd/provider/appstream/zz_main.go index d8c27ddd05..ca956f0fd0 100644 --- a/cmd/provider/appstream/zz_main.go +++ b/cmd/provider/appstream/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/appsync/zz_main.go b/cmd/provider/appsync/zz_main.go index 4ef5227356..1d371c0555 100644 --- a/cmd/provider/appsync/zz_main.go +++ b/cmd/provider/appsync/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/athena/zz_main.go b/cmd/provider/athena/zz_main.go index c261751117..862982192e 100644 --- a/cmd/provider/athena/zz_main.go +++ b/cmd/provider/athena/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/autoscaling/zz_main.go b/cmd/provider/autoscaling/zz_main.go index 9f706a902c..e5d87a37e4 100644 --- a/cmd/provider/autoscaling/zz_main.go +++ b/cmd/provider/autoscaling/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/autoscalingplans/zz_main.go b/cmd/provider/autoscalingplans/zz_main.go index 34f98158b7..37fa001ba4 100644 --- a/cmd/provider/autoscalingplans/zz_main.go +++ b/cmd/provider/autoscalingplans/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/backup/zz_main.go b/cmd/provider/backup/zz_main.go index 38511355c8..eeb1d9f630 100644 --- a/cmd/provider/backup/zz_main.go +++ b/cmd/provider/backup/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/batch/zz_main.go b/cmd/provider/batch/zz_main.go index 975da06a26..de3ac2fd58 100644 --- a/cmd/provider/batch/zz_main.go +++ b/cmd/provider/batch/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/budgets/zz_main.go b/cmd/provider/budgets/zz_main.go index 001f99dd5f..d0c5c0ea36 100644 --- a/cmd/provider/budgets/zz_main.go +++ b/cmd/provider/budgets/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/ce/zz_main.go b/cmd/provider/ce/zz_main.go index 3fd0c69827..7fb434819a 100644 --- a/cmd/provider/ce/zz_main.go +++ b/cmd/provider/ce/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/chime/zz_main.go b/cmd/provider/chime/zz_main.go index e3d031b49b..e2c73f4080 100644 --- a/cmd/provider/chime/zz_main.go +++ b/cmd/provider/chime/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/cloud9/zz_main.go b/cmd/provider/cloud9/zz_main.go index ddc681dd92..8dd686f2d0 100644 --- a/cmd/provider/cloud9/zz_main.go +++ b/cmd/provider/cloud9/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/cloudcontrol/zz_main.go b/cmd/provider/cloudcontrol/zz_main.go index 010358a30d..d6f07bb34d 100644 --- a/cmd/provider/cloudcontrol/zz_main.go +++ b/cmd/provider/cloudcontrol/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/cloudformation/zz_main.go b/cmd/provider/cloudformation/zz_main.go index 0bddf6e293..9f52ffa83e 100644 --- a/cmd/provider/cloudformation/zz_main.go +++ b/cmd/provider/cloudformation/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/cloudfront/zz_main.go b/cmd/provider/cloudfront/zz_main.go index e52afac44b..012420e158 100644 --- a/cmd/provider/cloudfront/zz_main.go +++ b/cmd/provider/cloudfront/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/cloudsearch/zz_main.go b/cmd/provider/cloudsearch/zz_main.go index 6a5f458034..d93f5292e2 100644 --- a/cmd/provider/cloudsearch/zz_main.go +++ b/cmd/provider/cloudsearch/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/cloudtrail/zz_main.go b/cmd/provider/cloudtrail/zz_main.go index 75f681b07c..1f9c15f1bb 100644 --- a/cmd/provider/cloudtrail/zz_main.go +++ b/cmd/provider/cloudtrail/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/cloudwatch/zz_main.go b/cmd/provider/cloudwatch/zz_main.go index 91eb59e130..97a699b9f7 100644 --- a/cmd/provider/cloudwatch/zz_main.go +++ b/cmd/provider/cloudwatch/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/cloudwatchevents/zz_main.go b/cmd/provider/cloudwatchevents/zz_main.go index 34b36998bc..d195faba9f 100644 --- a/cmd/provider/cloudwatchevents/zz_main.go +++ b/cmd/provider/cloudwatchevents/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/cloudwatchlogs/zz_main.go b/cmd/provider/cloudwatchlogs/zz_main.go index 893a2ceb17..b97e124d8d 100644 --- a/cmd/provider/cloudwatchlogs/zz_main.go +++ b/cmd/provider/cloudwatchlogs/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/codeartifact/zz_main.go b/cmd/provider/codeartifact/zz_main.go index 4c438457ba..7eba55e5c5 100644 --- a/cmd/provider/codeartifact/zz_main.go +++ b/cmd/provider/codeartifact/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/codecommit/zz_main.go b/cmd/provider/codecommit/zz_main.go index aaff2e07fe..acb0c32d71 100644 --- a/cmd/provider/codecommit/zz_main.go +++ b/cmd/provider/codecommit/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/codeguruprofiler/zz_main.go b/cmd/provider/codeguruprofiler/zz_main.go index 1243eab5f1..739ff502e5 100644 --- a/cmd/provider/codeguruprofiler/zz_main.go +++ b/cmd/provider/codeguruprofiler/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/codepipeline/zz_main.go b/cmd/provider/codepipeline/zz_main.go index a36505b5da..119c55abee 100644 --- a/cmd/provider/codepipeline/zz_main.go +++ b/cmd/provider/codepipeline/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/codestarconnections/zz_main.go b/cmd/provider/codestarconnections/zz_main.go index 99e467f367..643a2f9bb3 100644 --- a/cmd/provider/codestarconnections/zz_main.go +++ b/cmd/provider/codestarconnections/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/codestarnotifications/zz_main.go b/cmd/provider/codestarnotifications/zz_main.go index 739f2cb7fa..211213f106 100644 --- a/cmd/provider/codestarnotifications/zz_main.go +++ b/cmd/provider/codestarnotifications/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/cognitoidentity/zz_main.go b/cmd/provider/cognitoidentity/zz_main.go index 2b609d79b1..7819aa2bdf 100644 --- a/cmd/provider/cognitoidentity/zz_main.go +++ b/cmd/provider/cognitoidentity/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/cognitoidp/zz_main.go b/cmd/provider/cognitoidp/zz_main.go index 55dbdbbf83..5fcfcf8720 100644 --- a/cmd/provider/cognitoidp/zz_main.go +++ b/cmd/provider/cognitoidp/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/config/zz_main.go b/cmd/provider/config/zz_main.go index 1943052086..3083b82009 100644 --- a/cmd/provider/config/zz_main.go +++ b/cmd/provider/config/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/configservice/zz_main.go b/cmd/provider/configservice/zz_main.go index 20d86fe64a..b3fd9f4b7a 100644 --- a/cmd/provider/configservice/zz_main.go +++ b/cmd/provider/configservice/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/connect/zz_main.go b/cmd/provider/connect/zz_main.go index b63eb1eede..f7bcc226a6 100644 --- a/cmd/provider/connect/zz_main.go +++ b/cmd/provider/connect/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/cur/zz_main.go b/cmd/provider/cur/zz_main.go index 83c7edb9e4..0f33224113 100644 --- a/cmd/provider/cur/zz_main.go +++ b/cmd/provider/cur/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/dataexchange/zz_main.go b/cmd/provider/dataexchange/zz_main.go index 6852ff0b2d..5ee3667703 100644 --- a/cmd/provider/dataexchange/zz_main.go +++ b/cmd/provider/dataexchange/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/datapipeline/zz_main.go b/cmd/provider/datapipeline/zz_main.go index eaa2a30289..435774a9ae 100644 --- a/cmd/provider/datapipeline/zz_main.go +++ b/cmd/provider/datapipeline/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/datasync/zz_main.go b/cmd/provider/datasync/zz_main.go index 527256b644..0a8bb95e50 100644 --- a/cmd/provider/datasync/zz_main.go +++ b/cmd/provider/datasync/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/dax/zz_main.go b/cmd/provider/dax/zz_main.go index 5460deaef3..d6dcc5f734 100644 --- a/cmd/provider/dax/zz_main.go +++ b/cmd/provider/dax/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/deploy/zz_main.go b/cmd/provider/deploy/zz_main.go index f1b4e5dd53..27e350c202 100644 --- a/cmd/provider/deploy/zz_main.go +++ b/cmd/provider/deploy/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/detective/zz_main.go b/cmd/provider/detective/zz_main.go index 3f3d539872..b9eb853d45 100644 --- a/cmd/provider/detective/zz_main.go +++ b/cmd/provider/detective/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/devicefarm/zz_main.go b/cmd/provider/devicefarm/zz_main.go index 6664b5a640..0244cf2df6 100644 --- a/cmd/provider/devicefarm/zz_main.go +++ b/cmd/provider/devicefarm/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/directconnect/zz_main.go b/cmd/provider/directconnect/zz_main.go index 7373c418df..b5457bd0c7 100644 --- a/cmd/provider/directconnect/zz_main.go +++ b/cmd/provider/directconnect/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/dlm/zz_main.go b/cmd/provider/dlm/zz_main.go index c759d05eb6..f0a004ff97 100644 --- a/cmd/provider/dlm/zz_main.go +++ b/cmd/provider/dlm/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/dms/zz_main.go b/cmd/provider/dms/zz_main.go index 221a570fe2..75e15303f1 100644 --- a/cmd/provider/dms/zz_main.go +++ b/cmd/provider/dms/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/docdb/zz_main.go b/cmd/provider/docdb/zz_main.go index 8b120a515a..f33cc57e80 100644 --- a/cmd/provider/docdb/zz_main.go +++ b/cmd/provider/docdb/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/ds/zz_main.go b/cmd/provider/ds/zz_main.go index 4a886f33c1..5db03b13e5 100644 --- a/cmd/provider/ds/zz_main.go +++ b/cmd/provider/ds/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/dynamodb/zz_main.go b/cmd/provider/dynamodb/zz_main.go index 7950c07367..7da38a4591 100644 --- a/cmd/provider/dynamodb/zz_main.go +++ b/cmd/provider/dynamodb/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/ec2/zz_main.go b/cmd/provider/ec2/zz_main.go index 13de449ec2..ea230a4694 100644 --- a/cmd/provider/ec2/zz_main.go +++ b/cmd/provider/ec2/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/ecr/zz_main.go b/cmd/provider/ecr/zz_main.go index 6da539be08..589b0125b5 100644 --- a/cmd/provider/ecr/zz_main.go +++ b/cmd/provider/ecr/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/ecrpublic/zz_main.go b/cmd/provider/ecrpublic/zz_main.go index f98c644f46..2b99f079e4 100644 --- a/cmd/provider/ecrpublic/zz_main.go +++ b/cmd/provider/ecrpublic/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/ecs/zz_main.go b/cmd/provider/ecs/zz_main.go index aca36facea..c1cfe34623 100644 --- a/cmd/provider/ecs/zz_main.go +++ b/cmd/provider/ecs/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/efs/zz_main.go b/cmd/provider/efs/zz_main.go index eec397ba90..1fadf1e918 100644 --- a/cmd/provider/efs/zz_main.go +++ b/cmd/provider/efs/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/eks/zz_main.go b/cmd/provider/eks/zz_main.go index b1224bab3d..315ec5f150 100644 --- a/cmd/provider/eks/zz_main.go +++ b/cmd/provider/eks/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/elasticache/zz_main.go b/cmd/provider/elasticache/zz_main.go index ab37aedb00..7a696db213 100644 --- a/cmd/provider/elasticache/zz_main.go +++ b/cmd/provider/elasticache/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/elasticbeanstalk/zz_main.go b/cmd/provider/elasticbeanstalk/zz_main.go index 0d796c5325..00ef810830 100644 --- a/cmd/provider/elasticbeanstalk/zz_main.go +++ b/cmd/provider/elasticbeanstalk/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/elasticsearch/zz_main.go b/cmd/provider/elasticsearch/zz_main.go index e9003f303a..fbb980ac16 100644 --- a/cmd/provider/elasticsearch/zz_main.go +++ b/cmd/provider/elasticsearch/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/elastictranscoder/zz_main.go b/cmd/provider/elastictranscoder/zz_main.go index 04504e7d3f..eeace41098 100644 --- a/cmd/provider/elastictranscoder/zz_main.go +++ b/cmd/provider/elastictranscoder/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/elb/zz_main.go b/cmd/provider/elb/zz_main.go index 1ef23be91b..26212cd085 100644 --- a/cmd/provider/elb/zz_main.go +++ b/cmd/provider/elb/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/elbv2/zz_main.go b/cmd/provider/elbv2/zz_main.go index 087695f6d6..9cb1366de0 100644 --- a/cmd/provider/elbv2/zz_main.go +++ b/cmd/provider/elbv2/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/emr/zz_main.go b/cmd/provider/emr/zz_main.go index 78eabe4fd9..cb33a26e2a 100644 --- a/cmd/provider/emr/zz_main.go +++ b/cmd/provider/emr/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/emrserverless/zz_main.go b/cmd/provider/emrserverless/zz_main.go index 6e364bc7bb..607b74d67c 100644 --- a/cmd/provider/emrserverless/zz_main.go +++ b/cmd/provider/emrserverless/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/evidently/zz_main.go b/cmd/provider/evidently/zz_main.go index 2575330388..5f48fc6825 100644 --- a/cmd/provider/evidently/zz_main.go +++ b/cmd/provider/evidently/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/firehose/zz_main.go b/cmd/provider/firehose/zz_main.go index f82b3283f9..3511b3fb6e 100644 --- a/cmd/provider/firehose/zz_main.go +++ b/cmd/provider/firehose/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/fis/zz_main.go b/cmd/provider/fis/zz_main.go index 6418b9cbf8..26c2201de4 100644 --- a/cmd/provider/fis/zz_main.go +++ b/cmd/provider/fis/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/fsx/zz_main.go b/cmd/provider/fsx/zz_main.go index 45a69f42df..f8ada3028a 100644 --- a/cmd/provider/fsx/zz_main.go +++ b/cmd/provider/fsx/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/gamelift/zz_main.go b/cmd/provider/gamelift/zz_main.go index 2cfb861043..8292008d44 100644 --- a/cmd/provider/gamelift/zz_main.go +++ b/cmd/provider/gamelift/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/glacier/zz_main.go b/cmd/provider/glacier/zz_main.go index 727c16da7e..d6adf4e41f 100644 --- a/cmd/provider/glacier/zz_main.go +++ b/cmd/provider/glacier/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/globalaccelerator/zz_main.go b/cmd/provider/globalaccelerator/zz_main.go index 7adde9a32b..23ac3e6ec7 100644 --- a/cmd/provider/globalaccelerator/zz_main.go +++ b/cmd/provider/globalaccelerator/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/glue/zz_main.go b/cmd/provider/glue/zz_main.go index da4712249e..368127e087 100644 --- a/cmd/provider/glue/zz_main.go +++ b/cmd/provider/glue/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/grafana/zz_main.go b/cmd/provider/grafana/zz_main.go index c3858d0dd3..681f8db688 100644 --- a/cmd/provider/grafana/zz_main.go +++ b/cmd/provider/grafana/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/guardduty/zz_main.go b/cmd/provider/guardduty/zz_main.go index ae89b48ccc..f6c7f83317 100644 --- a/cmd/provider/guardduty/zz_main.go +++ b/cmd/provider/guardduty/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/iam/zz_main.go b/cmd/provider/iam/zz_main.go index bed8ea3479..a31151ae77 100644 --- a/cmd/provider/iam/zz_main.go +++ b/cmd/provider/iam/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/identitystore/zz_main.go b/cmd/provider/identitystore/zz_main.go index 4757893b1d..3185a8d44b 100644 --- a/cmd/provider/identitystore/zz_main.go +++ b/cmd/provider/identitystore/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/imagebuilder/zz_main.go b/cmd/provider/imagebuilder/zz_main.go index 2761955c99..2ce1e55884 100644 --- a/cmd/provider/imagebuilder/zz_main.go +++ b/cmd/provider/imagebuilder/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/inspector/zz_main.go b/cmd/provider/inspector/zz_main.go index bfc33cf863..58a6980a4d 100644 --- a/cmd/provider/inspector/zz_main.go +++ b/cmd/provider/inspector/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/inspector2/zz_main.go b/cmd/provider/inspector2/zz_main.go index adb500c32f..cb1d678347 100644 --- a/cmd/provider/inspector2/zz_main.go +++ b/cmd/provider/inspector2/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/iot/zz_main.go b/cmd/provider/iot/zz_main.go index 0552923b72..476cacefeb 100644 --- a/cmd/provider/iot/zz_main.go +++ b/cmd/provider/iot/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/ivs/zz_main.go b/cmd/provider/ivs/zz_main.go index 74a9158ea4..721f5c2b65 100644 --- a/cmd/provider/ivs/zz_main.go +++ b/cmd/provider/ivs/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/kafka/zz_main.go b/cmd/provider/kafka/zz_main.go index 199e6185ce..6005d23488 100644 --- a/cmd/provider/kafka/zz_main.go +++ b/cmd/provider/kafka/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/kafkaconnect/zz_main.go b/cmd/provider/kafkaconnect/zz_main.go index e700522898..de07cc4a58 100644 --- a/cmd/provider/kafkaconnect/zz_main.go +++ b/cmd/provider/kafkaconnect/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/kendra/zz_main.go b/cmd/provider/kendra/zz_main.go index f7e61068e0..2e79c60181 100644 --- a/cmd/provider/kendra/zz_main.go +++ b/cmd/provider/kendra/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/keyspaces/zz_main.go b/cmd/provider/keyspaces/zz_main.go index dec7e2099f..d36bb05288 100644 --- a/cmd/provider/keyspaces/zz_main.go +++ b/cmd/provider/keyspaces/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/kinesis/zz_main.go b/cmd/provider/kinesis/zz_main.go index a62ba61da9..9c1d9a540f 100644 --- a/cmd/provider/kinesis/zz_main.go +++ b/cmd/provider/kinesis/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/kinesisanalytics/zz_main.go b/cmd/provider/kinesisanalytics/zz_main.go index 7975c1e14e..5be81576d1 100644 --- a/cmd/provider/kinesisanalytics/zz_main.go +++ b/cmd/provider/kinesisanalytics/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/kinesisanalyticsv2/zz_main.go b/cmd/provider/kinesisanalyticsv2/zz_main.go index f84e6a2319..32680979c3 100644 --- a/cmd/provider/kinesisanalyticsv2/zz_main.go +++ b/cmd/provider/kinesisanalyticsv2/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/kinesisvideo/zz_main.go b/cmd/provider/kinesisvideo/zz_main.go index b11b44a5ce..61ca5a3d18 100644 --- a/cmd/provider/kinesisvideo/zz_main.go +++ b/cmd/provider/kinesisvideo/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/kms/zz_main.go b/cmd/provider/kms/zz_main.go index 79cf07f2f9..e955f7f5f3 100644 --- a/cmd/provider/kms/zz_main.go +++ b/cmd/provider/kms/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/lakeformation/zz_main.go b/cmd/provider/lakeformation/zz_main.go index 8472800424..d47de5ca61 100644 --- a/cmd/provider/lakeformation/zz_main.go +++ b/cmd/provider/lakeformation/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/lambda/zz_main.go b/cmd/provider/lambda/zz_main.go index 4e19cd507c..438fac2043 100644 --- a/cmd/provider/lambda/zz_main.go +++ b/cmd/provider/lambda/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/lexmodels/zz_main.go b/cmd/provider/lexmodels/zz_main.go index 1a0ef96a0a..18245822f5 100644 --- a/cmd/provider/lexmodels/zz_main.go +++ b/cmd/provider/lexmodels/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/licensemanager/zz_main.go b/cmd/provider/licensemanager/zz_main.go index 2fdc7af224..5a850b2bde 100644 --- a/cmd/provider/licensemanager/zz_main.go +++ b/cmd/provider/licensemanager/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/lightsail/zz_main.go b/cmd/provider/lightsail/zz_main.go index 15e0203ad4..706c2eb48e 100644 --- a/cmd/provider/lightsail/zz_main.go +++ b/cmd/provider/lightsail/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/location/zz_main.go b/cmd/provider/location/zz_main.go index 1940478152..f05681d7af 100644 --- a/cmd/provider/location/zz_main.go +++ b/cmd/provider/location/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/macie2/zz_main.go b/cmd/provider/macie2/zz_main.go index 7d482abc67..c845f33553 100644 --- a/cmd/provider/macie2/zz_main.go +++ b/cmd/provider/macie2/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/mediaconvert/zz_main.go b/cmd/provider/mediaconvert/zz_main.go index e70ffda625..c80241bc7d 100644 --- a/cmd/provider/mediaconvert/zz_main.go +++ b/cmd/provider/mediaconvert/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/medialive/zz_main.go b/cmd/provider/medialive/zz_main.go index 3cff6b9fe2..16b9293248 100644 --- a/cmd/provider/medialive/zz_main.go +++ b/cmd/provider/medialive/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/mediapackage/zz_main.go b/cmd/provider/mediapackage/zz_main.go index 326ba96f5c..37428111a6 100644 --- a/cmd/provider/mediapackage/zz_main.go +++ b/cmd/provider/mediapackage/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/mediastore/zz_main.go b/cmd/provider/mediastore/zz_main.go index f27b166c5c..8c9608473f 100644 --- a/cmd/provider/mediastore/zz_main.go +++ b/cmd/provider/mediastore/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/memorydb/zz_main.go b/cmd/provider/memorydb/zz_main.go index ce75c086c0..9e04de358d 100644 --- a/cmd/provider/memorydb/zz_main.go +++ b/cmd/provider/memorydb/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/monolith/zz_main.go b/cmd/provider/monolith/zz_main.go index 604f37a5a0..66741eebfe 100644 --- a/cmd/provider/monolith/zz_main.go +++ b/cmd/provider/monolith/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -161,7 +162,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/mq/zz_main.go b/cmd/provider/mq/zz_main.go index 0b46f8ab69..7a4d2ab068 100644 --- a/cmd/provider/mq/zz_main.go +++ b/cmd/provider/mq/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/mwaa/zz_main.go b/cmd/provider/mwaa/zz_main.go index 252518c4e5..864666e1e9 100644 --- a/cmd/provider/mwaa/zz_main.go +++ b/cmd/provider/mwaa/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/neptune/zz_main.go b/cmd/provider/neptune/zz_main.go index 4a55e191c1..0de2eb7ba2 100644 --- a/cmd/provider/neptune/zz_main.go +++ b/cmd/provider/neptune/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/networkfirewall/zz_main.go b/cmd/provider/networkfirewall/zz_main.go index fa48e22632..9a81b64918 100644 --- a/cmd/provider/networkfirewall/zz_main.go +++ b/cmd/provider/networkfirewall/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/networkmanager/zz_main.go b/cmd/provider/networkmanager/zz_main.go index 656c7b5924..3f9c52bd7b 100644 --- a/cmd/provider/networkmanager/zz_main.go +++ b/cmd/provider/networkmanager/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/opensearch/zz_main.go b/cmd/provider/opensearch/zz_main.go index 14e428cf05..c1f7f81c08 100644 --- a/cmd/provider/opensearch/zz_main.go +++ b/cmd/provider/opensearch/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/opensearchserverless/zz_main.go b/cmd/provider/opensearchserverless/zz_main.go index a86d548708..0dc88d3d37 100644 --- a/cmd/provider/opensearchserverless/zz_main.go +++ b/cmd/provider/opensearchserverless/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/opsworks/zz_main.go b/cmd/provider/opsworks/zz_main.go index d628c18935..a2a27d2d8a 100644 --- a/cmd/provider/opsworks/zz_main.go +++ b/cmd/provider/opsworks/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/organizations/zz_main.go b/cmd/provider/organizations/zz_main.go index 706736bd46..7a21d83736 100644 --- a/cmd/provider/organizations/zz_main.go +++ b/cmd/provider/organizations/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/pinpoint/zz_main.go b/cmd/provider/pinpoint/zz_main.go index ded372405c..be944c679a 100644 --- a/cmd/provider/pinpoint/zz_main.go +++ b/cmd/provider/pinpoint/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/pipes/zz_main.go b/cmd/provider/pipes/zz_main.go index f9f2e2c594..37a5d14eac 100644 --- a/cmd/provider/pipes/zz_main.go +++ b/cmd/provider/pipes/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/qldb/zz_main.go b/cmd/provider/qldb/zz_main.go index b0f8c8c9f8..1eec278c73 100644 --- a/cmd/provider/qldb/zz_main.go +++ b/cmd/provider/qldb/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/quicksight/zz_main.go b/cmd/provider/quicksight/zz_main.go index 76638e1dad..ca10b7dfac 100644 --- a/cmd/provider/quicksight/zz_main.go +++ b/cmd/provider/quicksight/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/ram/zz_main.go b/cmd/provider/ram/zz_main.go index 45c71cf9f2..a63a912ffb 100644 --- a/cmd/provider/ram/zz_main.go +++ b/cmd/provider/ram/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/rds/zz_main.go b/cmd/provider/rds/zz_main.go index 6c3386436e..65aef73b71 100644 --- a/cmd/provider/rds/zz_main.go +++ b/cmd/provider/rds/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/redshift/zz_main.go b/cmd/provider/redshift/zz_main.go index 616ba38541..b2fa22f83c 100644 --- a/cmd/provider/redshift/zz_main.go +++ b/cmd/provider/redshift/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/redshiftserverless/zz_main.go b/cmd/provider/redshiftserverless/zz_main.go index b3747b9bfc..596f3bfbc8 100644 --- a/cmd/provider/redshiftserverless/zz_main.go +++ b/cmd/provider/redshiftserverless/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/resourcegroups/zz_main.go b/cmd/provider/resourcegroups/zz_main.go index 8402457936..895ced62ea 100644 --- a/cmd/provider/resourcegroups/zz_main.go +++ b/cmd/provider/resourcegroups/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/rolesanywhere/zz_main.go b/cmd/provider/rolesanywhere/zz_main.go index 9968bccdf3..854c007c00 100644 --- a/cmd/provider/rolesanywhere/zz_main.go +++ b/cmd/provider/rolesanywhere/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/route53/zz_main.go b/cmd/provider/route53/zz_main.go index 781e610b22..8c864ed9d6 100644 --- a/cmd/provider/route53/zz_main.go +++ b/cmd/provider/route53/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/route53recoverycontrolconfig/zz_main.go b/cmd/provider/route53recoverycontrolconfig/zz_main.go index 66e9db31bf..aaf63a541a 100644 --- a/cmd/provider/route53recoverycontrolconfig/zz_main.go +++ b/cmd/provider/route53recoverycontrolconfig/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/route53recoveryreadiness/zz_main.go b/cmd/provider/route53recoveryreadiness/zz_main.go index 4f6e53fd91..85ac80cfbe 100644 --- a/cmd/provider/route53recoveryreadiness/zz_main.go +++ b/cmd/provider/route53recoveryreadiness/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/route53resolver/zz_main.go b/cmd/provider/route53resolver/zz_main.go index c3e8be33bc..418f346b9b 100644 --- a/cmd/provider/route53resolver/zz_main.go +++ b/cmd/provider/route53resolver/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/rum/zz_main.go b/cmd/provider/rum/zz_main.go index 84db41ee57..8256b01faf 100644 --- a/cmd/provider/rum/zz_main.go +++ b/cmd/provider/rum/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/s3/zz_main.go b/cmd/provider/s3/zz_main.go index 1c1b1224a4..9174a64363 100644 --- a/cmd/provider/s3/zz_main.go +++ b/cmd/provider/s3/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/s3control/zz_main.go b/cmd/provider/s3control/zz_main.go index 744d3f995d..d0b3b96d30 100644 --- a/cmd/provider/s3control/zz_main.go +++ b/cmd/provider/s3control/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/sagemaker/zz_main.go b/cmd/provider/sagemaker/zz_main.go index 367c6fbd13..6165626948 100644 --- a/cmd/provider/sagemaker/zz_main.go +++ b/cmd/provider/sagemaker/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/scheduler/zz_main.go b/cmd/provider/scheduler/zz_main.go index 13058dac02..ce01fbca9e 100644 --- a/cmd/provider/scheduler/zz_main.go +++ b/cmd/provider/scheduler/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/schemas/zz_main.go b/cmd/provider/schemas/zz_main.go index a8544a5806..63a1fe0743 100644 --- a/cmd/provider/schemas/zz_main.go +++ b/cmd/provider/schemas/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/secretsmanager/zz_main.go b/cmd/provider/secretsmanager/zz_main.go index 46e9537f2a..13c9dcf519 100644 --- a/cmd/provider/secretsmanager/zz_main.go +++ b/cmd/provider/secretsmanager/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/securityhub/zz_main.go b/cmd/provider/securityhub/zz_main.go index 3384a4b68f..e674b2be84 100644 --- a/cmd/provider/securityhub/zz_main.go +++ b/cmd/provider/securityhub/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/serverlessrepo/zz_main.go b/cmd/provider/serverlessrepo/zz_main.go index 83e907efeb..be386253d0 100644 --- a/cmd/provider/serverlessrepo/zz_main.go +++ b/cmd/provider/serverlessrepo/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/servicecatalog/zz_main.go b/cmd/provider/servicecatalog/zz_main.go index c9dfc33f3d..de6a1b4257 100644 --- a/cmd/provider/servicecatalog/zz_main.go +++ b/cmd/provider/servicecatalog/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/servicediscovery/zz_main.go b/cmd/provider/servicediscovery/zz_main.go index a02b008370..0d9038ba28 100644 --- a/cmd/provider/servicediscovery/zz_main.go +++ b/cmd/provider/servicediscovery/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/servicequotas/zz_main.go b/cmd/provider/servicequotas/zz_main.go index 67f090e330..81f1b8d5e6 100644 --- a/cmd/provider/servicequotas/zz_main.go +++ b/cmd/provider/servicequotas/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/ses/zz_main.go b/cmd/provider/ses/zz_main.go index 98613eb0d7..a3626df3ff 100644 --- a/cmd/provider/ses/zz_main.go +++ b/cmd/provider/ses/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/sesv2/zz_main.go b/cmd/provider/sesv2/zz_main.go index 5f7e95f701..f5aebd1c19 100644 --- a/cmd/provider/sesv2/zz_main.go +++ b/cmd/provider/sesv2/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/sfn/zz_main.go b/cmd/provider/sfn/zz_main.go index 14ac140aca..0f6deb9f3f 100644 --- a/cmd/provider/sfn/zz_main.go +++ b/cmd/provider/sfn/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/signer/zz_main.go b/cmd/provider/signer/zz_main.go index 6778dffd30..c993569d88 100644 --- a/cmd/provider/signer/zz_main.go +++ b/cmd/provider/signer/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/simpledb/zz_main.go b/cmd/provider/simpledb/zz_main.go index f45a94a69f..e285579dc7 100644 --- a/cmd/provider/simpledb/zz_main.go +++ b/cmd/provider/simpledb/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/sns/zz_main.go b/cmd/provider/sns/zz_main.go index 58348fb2ab..acf8cbe70a 100644 --- a/cmd/provider/sns/zz_main.go +++ b/cmd/provider/sns/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/sqs/zz_main.go b/cmd/provider/sqs/zz_main.go index a97baa70b9..a0b499f079 100644 --- a/cmd/provider/sqs/zz_main.go +++ b/cmd/provider/sqs/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/ssm/zz_main.go b/cmd/provider/ssm/zz_main.go index 535b623908..928cb13746 100644 --- a/cmd/provider/ssm/zz_main.go +++ b/cmd/provider/ssm/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/ssoadmin/zz_main.go b/cmd/provider/ssoadmin/zz_main.go index d8f0954a15..b1052fb5e0 100644 --- a/cmd/provider/ssoadmin/zz_main.go +++ b/cmd/provider/ssoadmin/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/swf/zz_main.go b/cmd/provider/swf/zz_main.go index 8808200cb9..39d3ac056a 100644 --- a/cmd/provider/swf/zz_main.go +++ b/cmd/provider/swf/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/timestreamwrite/zz_main.go b/cmd/provider/timestreamwrite/zz_main.go index 943b145687..3d32f4d1c8 100644 --- a/cmd/provider/timestreamwrite/zz_main.go +++ b/cmd/provider/timestreamwrite/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/transcribe/zz_main.go b/cmd/provider/transcribe/zz_main.go index 015a0e0437..c357b2ac11 100644 --- a/cmd/provider/transcribe/zz_main.go +++ b/cmd/provider/transcribe/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/transfer/zz_main.go b/cmd/provider/transfer/zz_main.go index 0169846866..338345721d 100644 --- a/cmd/provider/transfer/zz_main.go +++ b/cmd/provider/transfer/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/vpc/zz_main.go b/cmd/provider/vpc/zz_main.go index f690a71aff..2ddad3b25e 100644 --- a/cmd/provider/vpc/zz_main.go +++ b/cmd/provider/vpc/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/waf/zz_main.go b/cmd/provider/waf/zz_main.go index 8bb267630a..c4243cfc3e 100644 --- a/cmd/provider/waf/zz_main.go +++ b/cmd/provider/waf/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/wafregional/zz_main.go b/cmd/provider/wafregional/zz_main.go index b06e47123d..141f5071b3 100644 --- a/cmd/provider/wafregional/zz_main.go +++ b/cmd/provider/wafregional/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/wafv2/zz_main.go b/cmd/provider/wafv2/zz_main.go index c39c0b9222..e434be32f9 100644 --- a/cmd/provider/wafv2/zz_main.go +++ b/cmd/provider/wafv2/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/workspaces/zz_main.go b/cmd/provider/workspaces/zz_main.go index 37b4e2b27a..7f47e8e132 100644 --- a/cmd/provider/workspaces/zz_main.go +++ b/cmd/provider/workspaces/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/cmd/provider/xray/zz_main.go b/cmd/provider/xray/zz_main.go index 1d53a9e7d8..e917acf6a7 100644 --- a/cmd/provider/xray/zz_main.go +++ b/cmd/provider/xray/zz_main.go @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -156,7 +157,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr, diff --git a/config/registry.go b/config/registry.go index ea0f176ea9..12754ac88c 100644 --- a/config/registry.go +++ b/config/registry.go @@ -113,7 +113,7 @@ func getProviderSchema(s string) (*schema.Provider, error) { // configuration is being read for the code generation pipelines. // In that case, we will only use the JSON schema for generating // the CRDs. -func GetProvider(ctx context.Context, generationProvider bool) (*config.Provider, error) { +func GetProvider(ctx context.Context, generationProvider bool, skipDefaultTags bool) (*config.Provider, error) { fwProvider, sdkProvider, err := xpprovider.GetProvider(ctx) if err != nil { return nil, errors.Wrap(err, "cannot get the Terraform framework and SDK providers") @@ -134,6 +134,22 @@ func GetProvider(ctx context.Context, generationProvider bool) (*config.Provider sdkProvider = p } + defaultResourceOptions := []config.ResourceOption{ + GroupKindOverrides(), + KindOverrides(), + RegionAddition(), + TagsAllRemoval(), + IdentifierAssignedByAWS(), + KnownReferencers(), + ResourceConfigurator(), + NamePrefixRemoval(), + DocumentationForTags(), + injectFieldRenamingConversionFunctions(), + } + if !skipDefaultTags { + defaultResourceOptions = append(defaultResourceOptions, AddExternalTagsField()) + } + modulePath := "github.com/upbound/provider-aws" pc := config.NewProvider([]byte(providerSchema), "aws", modulePath, providerMetadata, @@ -149,19 +165,7 @@ func GetProvider(ctx context.Context, generationProvider bool) (*config.Provider config.WithTerraformProvider(sdkProvider), config.WithTerraformPluginFrameworkProvider(fwProvider), config.WithSchemaTraversers(&config.SingletonListEmbedder{}), - config.WithDefaultResourceOptions( - GroupKindOverrides(), - KindOverrides(), - RegionAddition(), - TagsAllRemoval(), - IdentifierAssignedByAWS(), - KnownReferencers(), - AddExternalTagsField(), - ResourceConfigurator(), - NamePrefixRemoval(), - DocumentationForTags(), - injectFieldRenamingConversionFunctions(), - ), + config.WithDefaultResourceOptions(defaultResourceOptions...), ) pc.BasePackages.ControllerMap["internal/controller/eks/clusterauth"] = "eks" diff --git a/hack/main.go.tmpl b/hack/main.go.tmpl index c351f72c6b..b942f4c2f3 100644 --- a/hack/main.go.tmpl +++ b/hack/main.go.tmpl @@ -67,6 +67,7 @@ func main() { pollStateMetricInterval = app.Flag("poll-state-metric", "State metric recording interval").Default("5s").Duration() leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() maxReconcileRate = app.Flag("max-reconcile-rate", "The global maximum rate per second at which resources may be checked for drift from the desired state.").Default("100").Int() + skipDefaultTags = app.Flag("skip-default-tags", "Do not set default crossplane tags for resources").Bool() namespace = app.Flag("namespace", "Namespace used to set as default scope in default secret store config.").Default("crossplane-system").Envar("POD_NAMESPACE").String() enableExternalSecretStores = app.Flag("enable-external-secret-stores", "Enable support for ExternalSecretStores.").Default("false").Envar("ENABLE_EXTERNAL_SECRET_STORES").Bool() @@ -161,7 +162,7 @@ func main() { metrics.Registry.MustRegister(stateMetrics) ctx := context.Background() - provider, err := config.GetProvider(ctx, false) + provider, err := config.GetProvider(ctx, false, *skipDefaultTags) kingpin.FatalIfError(err, "Cannot initialize the provider configuration") setupConfig := &clients.SetupConfig{ Logger: logr,