From d6aea277c3ff8d2181bb2b401d2ba43837e39b0a Mon Sep 17 00:00:00 2001 From: Alper Rifat Ulucinar Date: Thu, 25 Jul 2024 14:08:00 +0300 Subject: [PATCH] Bump upjet to commit e489efa71796 - Fix an issue with API conversions when the TypeMeta information has been dropped. - Add v1beta1 -> v1beta3 field renaming conversions for relevant resources. - Do not replace but append conversion functions. Signed-off-by: Alper Rifat Ulucinar --- cmd/provider/accessanalyzer/zz_main.go | 2 +- cmd/provider/account/zz_main.go | 2 +- cmd/provider/acm/zz_main.go | 2 +- cmd/provider/acmpca/zz_main.go | 2 +- cmd/provider/amp/zz_main.go | 2 +- cmd/provider/amplify/zz_main.go | 2 +- cmd/provider/apigateway/zz_main.go | 2 +- cmd/provider/apigatewayv2/zz_main.go | 2 +- cmd/provider/appautoscaling/zz_main.go | 2 +- cmd/provider/appconfig/zz_main.go | 2 +- cmd/provider/appflow/zz_main.go | 2 +- cmd/provider/appintegrations/zz_main.go | 2 +- cmd/provider/applicationinsights/zz_main.go | 2 +- cmd/provider/appmesh/zz_main.go | 2 +- cmd/provider/apprunner/zz_main.go | 2 +- cmd/provider/appstream/zz_main.go | 2 +- cmd/provider/appsync/zz_main.go | 2 +- cmd/provider/athena/zz_main.go | 2 +- cmd/provider/autoscaling/zz_main.go | 2 +- cmd/provider/autoscalingplans/zz_main.go | 2 +- cmd/provider/backup/zz_main.go | 2 +- cmd/provider/batch/zz_main.go | 2 +- cmd/provider/budgets/zz_main.go | 2 +- cmd/provider/ce/zz_main.go | 2 +- cmd/provider/chime/zz_main.go | 2 +- cmd/provider/cloud9/zz_main.go | 2 +- cmd/provider/cloudcontrol/zz_main.go | 2 +- cmd/provider/cloudformation/zz_main.go | 2 +- cmd/provider/cloudfront/zz_main.go | 2 +- cmd/provider/cloudsearch/zz_main.go | 2 +- cmd/provider/cloudtrail/zz_main.go | 2 +- cmd/provider/cloudwatch/zz_main.go | 2 +- cmd/provider/cloudwatchevents/zz_main.go | 2 +- cmd/provider/cloudwatchlogs/zz_main.go | 2 +- cmd/provider/codeartifact/zz_main.go | 2 +- cmd/provider/codecommit/zz_main.go | 2 +- cmd/provider/codeguruprofiler/zz_main.go | 2 +- cmd/provider/codepipeline/zz_main.go | 2 +- cmd/provider/codestarconnections/zz_main.go | 2 +- cmd/provider/codestarnotifications/zz_main.go | 2 +- cmd/provider/cognitoidentity/zz_main.go | 2 +- cmd/provider/cognitoidp/zz_main.go | 2 +- cmd/provider/config/zz_main.go | 2 +- cmd/provider/configservice/zz_main.go | 2 +- cmd/provider/connect/zz_main.go | 2 +- cmd/provider/cur/zz_main.go | 2 +- cmd/provider/dataexchange/zz_main.go | 2 +- cmd/provider/datapipeline/zz_main.go | 2 +- cmd/provider/datasync/zz_main.go | 2 +- cmd/provider/dax/zz_main.go | 2 +- cmd/provider/deploy/zz_main.go | 2 +- cmd/provider/detective/zz_main.go | 2 +- cmd/provider/devicefarm/zz_main.go | 2 +- cmd/provider/directconnect/zz_main.go | 2 +- cmd/provider/dlm/zz_main.go | 2 +- cmd/provider/dms/zz_main.go | 2 +- cmd/provider/docdb/zz_main.go | 2 +- cmd/provider/ds/zz_main.go | 2 +- cmd/provider/dynamodb/zz_main.go | 2 +- cmd/provider/ec2/zz_main.go | 2 +- cmd/provider/ecr/zz_main.go | 2 +- cmd/provider/ecrpublic/zz_main.go | 2 +- cmd/provider/ecs/zz_main.go | 2 +- cmd/provider/efs/zz_main.go | 2 +- cmd/provider/eks/zz_main.go | 2 +- cmd/provider/elasticache/zz_main.go | 2 +- cmd/provider/elasticbeanstalk/zz_main.go | 2 +- cmd/provider/elasticsearch/zz_main.go | 2 +- cmd/provider/elastictranscoder/zz_main.go | 2 +- cmd/provider/elb/zz_main.go | 2 +- cmd/provider/elbv2/zz_main.go | 2 +- cmd/provider/emr/zz_main.go | 2 +- cmd/provider/emrserverless/zz_main.go | 2 +- cmd/provider/evidently/zz_main.go | 2 +- cmd/provider/firehose/zz_main.go | 2 +- cmd/provider/fis/zz_main.go | 2 +- cmd/provider/fsx/zz_main.go | 2 +- cmd/provider/gamelift/zz_main.go | 2 +- cmd/provider/glacier/zz_main.go | 2 +- cmd/provider/globalaccelerator/zz_main.go | 2 +- cmd/provider/glue/zz_main.go | 2 +- cmd/provider/grafana/zz_main.go | 2 +- cmd/provider/guardduty/zz_main.go | 2 +- cmd/provider/iam/zz_main.go | 2 +- cmd/provider/identitystore/zz_main.go | 2 +- cmd/provider/imagebuilder/zz_main.go | 2 +- cmd/provider/inspector/zz_main.go | 2 +- cmd/provider/inspector2/zz_main.go | 2 +- cmd/provider/iot/zz_main.go | 2 +- cmd/provider/ivs/zz_main.go | 2 +- cmd/provider/kafka/zz_main.go | 2 +- cmd/provider/kafkaconnect/zz_main.go | 2 +- cmd/provider/kendra/zz_main.go | 2 +- cmd/provider/keyspaces/zz_main.go | 2 +- cmd/provider/kinesis/zz_main.go | 2 +- cmd/provider/kinesisanalytics/zz_main.go | 2 +- cmd/provider/kinesisanalyticsv2/zz_main.go | 2 +- cmd/provider/kinesisvideo/zz_main.go | 2 +- cmd/provider/kms/zz_main.go | 2 +- cmd/provider/lakeformation/zz_main.go | 2 +- cmd/provider/lambda/zz_main.go | 2 +- cmd/provider/lexmodels/zz_main.go | 2 +- cmd/provider/licensemanager/zz_main.go | 2 +- cmd/provider/lightsail/zz_main.go | 2 +- cmd/provider/location/zz_main.go | 2 +- cmd/provider/macie2/zz_main.go | 2 +- cmd/provider/mediaconvert/zz_main.go | 2 +- cmd/provider/medialive/zz_main.go | 2 +- cmd/provider/mediapackage/zz_main.go | 2 +- cmd/provider/mediastore/zz_main.go | 2 +- cmd/provider/memorydb/zz_main.go | 2 +- cmd/provider/monolith/zz_main.go | 2 +- cmd/provider/mq/zz_main.go | 2 +- cmd/provider/mwaa/zz_main.go | 2 +- cmd/provider/neptune/zz_main.go | 2 +- cmd/provider/networkfirewall/zz_main.go | 2 +- cmd/provider/networkmanager/zz_main.go | 2 +- cmd/provider/opensearch/zz_main.go | 2 +- cmd/provider/opensearchserverless/zz_main.go | 2 +- cmd/provider/opsworks/zz_main.go | 2 +- cmd/provider/organizations/zz_main.go | 2 +- cmd/provider/pinpoint/zz_main.go | 2 +- cmd/provider/qldb/zz_main.go | 2 +- cmd/provider/quicksight/zz_main.go | 2 +- cmd/provider/ram/zz_main.go | 2 +- cmd/provider/rds/zz_main.go | 2 +- cmd/provider/redshift/zz_main.go | 2 +- cmd/provider/redshiftserverless/zz_main.go | 2 +- cmd/provider/resourcegroups/zz_main.go | 2 +- cmd/provider/rolesanywhere/zz_main.go | 2 +- cmd/provider/route53/zz_main.go | 2 +- .../route53recoverycontrolconfig/zz_main.go | 2 +- .../route53recoveryreadiness/zz_main.go | 2 +- cmd/provider/route53resolver/zz_main.go | 2 +- cmd/provider/rum/zz_main.go | 2 +- cmd/provider/s3/zz_main.go | 2 +- cmd/provider/s3control/zz_main.go | 2 +- cmd/provider/sagemaker/zz_main.go | 2 +- cmd/provider/scheduler/zz_main.go | 2 +- cmd/provider/schemas/zz_main.go | 2 +- cmd/provider/secretsmanager/zz_main.go | 2 +- cmd/provider/securityhub/zz_main.go | 2 +- cmd/provider/serverlessrepo/zz_main.go | 2 +- cmd/provider/servicecatalog/zz_main.go | 2 +- cmd/provider/servicediscovery/zz_main.go | 2 +- cmd/provider/servicequotas/zz_main.go | 2 +- cmd/provider/ses/zz_main.go | 2 +- cmd/provider/sesv2/zz_main.go | 2 +- cmd/provider/sfn/zz_main.go | 2 +- cmd/provider/signer/zz_main.go | 2 +- cmd/provider/simpledb/zz_main.go | 2 +- cmd/provider/sns/zz_main.go | 2 +- cmd/provider/sqs/zz_main.go | 2 +- cmd/provider/ssm/zz_main.go | 2 +- cmd/provider/ssoadmin/zz_main.go | 2 +- cmd/provider/swf/zz_main.go | 2 +- cmd/provider/timestreamwrite/zz_main.go | 2 +- cmd/provider/transcribe/zz_main.go | 2 +- cmd/provider/transfer/zz_main.go | 2 +- cmd/provider/vpc/zz_main.go | 2 +- cmd/provider/waf/zz_main.go | 2 +- cmd/provider/wafregional/zz_main.go | 2 +- cmd/provider/wafv2/zz_main.go | 2 +- cmd/provider/workspaces/zz_main.go | 2 +- cmd/provider/xray/zz_main.go | 2 +- config/field-rename.yaml | 12 ++++++++ config/registry.go | 29 ++++++++++++++----- go.mod | 2 ++ go.sum | 4 +-- hack/main.go.tmpl | 2 +- 170 files changed, 204 insertions(+), 175 deletions(-) diff --git a/cmd/provider/accessanalyzer/zz_main.go b/cmd/provider/accessanalyzer/zz_main.go index 203317699f..e64fadd2f5 100644 --- a/cmd/provider/accessanalyzer/zz_main.go +++ b/cmd/provider/accessanalyzer/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_accessanalyzer(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/account/zz_main.go b/cmd/provider/account/zz_main.go index b5dc863e5f..c0b31a93a0 100644 --- a/cmd/provider/account/zz_main.go +++ b/cmd/provider/account/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_account(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/acm/zz_main.go b/cmd/provider/acm/zz_main.go index 377dc08369..cc824e0fdf 100644 --- a/cmd/provider/acm/zz_main.go +++ b/cmd/provider/acm/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_acm(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/acmpca/zz_main.go b/cmd/provider/acmpca/zz_main.go index be86d8aa1b..94c4d16903 100644 --- a/cmd/provider/acmpca/zz_main.go +++ b/cmd/provider/acmpca/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_acmpca(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/amp/zz_main.go b/cmd/provider/amp/zz_main.go index 73c23ed794..867771803b 100644 --- a/cmd/provider/amp/zz_main.go +++ b/cmd/provider/amp/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_amp(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/amplify/zz_main.go b/cmd/provider/amplify/zz_main.go index a067a471f9..f856f4421e 100644 --- a/cmd/provider/amplify/zz_main.go +++ b/cmd/provider/amplify/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_amplify(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/apigateway/zz_main.go b/cmd/provider/apigateway/zz_main.go index e989935158..074fe26d7f 100644 --- a/cmd/provider/apigateway/zz_main.go +++ b/cmd/provider/apigateway/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_apigateway(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/apigatewayv2/zz_main.go b/cmd/provider/apigatewayv2/zz_main.go index 6c74802c81..59fb0b4f14 100644 --- a/cmd/provider/apigatewayv2/zz_main.go +++ b/cmd/provider/apigatewayv2/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_apigatewayv2(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/appautoscaling/zz_main.go b/cmd/provider/appautoscaling/zz_main.go index 65b7d49c24..d7e9ec519d 100644 --- a/cmd/provider/appautoscaling/zz_main.go +++ b/cmd/provider/appautoscaling/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_appautoscaling(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/appconfig/zz_main.go b/cmd/provider/appconfig/zz_main.go index 5aa7aa0253..5ad1b14543 100644 --- a/cmd/provider/appconfig/zz_main.go +++ b/cmd/provider/appconfig/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_appconfig(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/appflow/zz_main.go b/cmd/provider/appflow/zz_main.go index 8874cae8e5..528206a7df 100644 --- a/cmd/provider/appflow/zz_main.go +++ b/cmd/provider/appflow/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_appflow(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/appintegrations/zz_main.go b/cmd/provider/appintegrations/zz_main.go index e33587be86..54e7787d5e 100644 --- a/cmd/provider/appintegrations/zz_main.go +++ b/cmd/provider/appintegrations/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_appintegrations(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/applicationinsights/zz_main.go b/cmd/provider/applicationinsights/zz_main.go index 5ed11550f8..fb70999693 100644 --- a/cmd/provider/applicationinsights/zz_main.go +++ b/cmd/provider/applicationinsights/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_applicationinsights(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/appmesh/zz_main.go b/cmd/provider/appmesh/zz_main.go index c479e0d919..562d60ad17 100644 --- a/cmd/provider/appmesh/zz_main.go +++ b/cmd/provider/appmesh/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_appmesh(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/apprunner/zz_main.go b/cmd/provider/apprunner/zz_main.go index 1dbdeca8ac..c3590f4075 100644 --- a/cmd/provider/apprunner/zz_main.go +++ b/cmd/provider/apprunner/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_apprunner(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/appstream/zz_main.go b/cmd/provider/appstream/zz_main.go index d8c27ddd05..a3ad4628b5 100644 --- a/cmd/provider/appstream/zz_main.go +++ b/cmd/provider/appstream/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_appstream(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/appsync/zz_main.go b/cmd/provider/appsync/zz_main.go index 4ef5227356..db92a01908 100644 --- a/cmd/provider/appsync/zz_main.go +++ b/cmd/provider/appsync/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_appsync(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/athena/zz_main.go b/cmd/provider/athena/zz_main.go index c261751117..b4fa7085d5 100644 --- a/cmd/provider/athena/zz_main.go +++ b/cmd/provider/athena/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_athena(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/autoscaling/zz_main.go b/cmd/provider/autoscaling/zz_main.go index 9f706a902c..225b147d0b 100644 --- a/cmd/provider/autoscaling/zz_main.go +++ b/cmd/provider/autoscaling/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_autoscaling(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/autoscalingplans/zz_main.go b/cmd/provider/autoscalingplans/zz_main.go index 34f98158b7..cb7805d65c 100644 --- a/cmd/provider/autoscalingplans/zz_main.go +++ b/cmd/provider/autoscalingplans/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_autoscalingplans(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/backup/zz_main.go b/cmd/provider/backup/zz_main.go index 38511355c8..cca8c8da36 100644 --- a/cmd/provider/backup/zz_main.go +++ b/cmd/provider/backup/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_backup(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/batch/zz_main.go b/cmd/provider/batch/zz_main.go index 975da06a26..ebaed94da9 100644 --- a/cmd/provider/batch/zz_main.go +++ b/cmd/provider/batch/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_batch(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/budgets/zz_main.go b/cmd/provider/budgets/zz_main.go index 001f99dd5f..d449cb7007 100644 --- a/cmd/provider/budgets/zz_main.go +++ b/cmd/provider/budgets/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_budgets(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/ce/zz_main.go b/cmd/provider/ce/zz_main.go index 3fd0c69827..7090ccecdb 100644 --- a/cmd/provider/ce/zz_main.go +++ b/cmd/provider/ce/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_ce(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/chime/zz_main.go b/cmd/provider/chime/zz_main.go index e3d031b49b..d028b3024b 100644 --- a/cmd/provider/chime/zz_main.go +++ b/cmd/provider/chime/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_chime(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/cloud9/zz_main.go b/cmd/provider/cloud9/zz_main.go index ddc681dd92..0a1cd29434 100644 --- a/cmd/provider/cloud9/zz_main.go +++ b/cmd/provider/cloud9/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_cloud9(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/cloudcontrol/zz_main.go b/cmd/provider/cloudcontrol/zz_main.go index 010358a30d..9391b16e69 100644 --- a/cmd/provider/cloudcontrol/zz_main.go +++ b/cmd/provider/cloudcontrol/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_cloudcontrol(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/cloudformation/zz_main.go b/cmd/provider/cloudformation/zz_main.go index 0bddf6e293..1fcc96cf59 100644 --- a/cmd/provider/cloudformation/zz_main.go +++ b/cmd/provider/cloudformation/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_cloudformation(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/cloudfront/zz_main.go b/cmd/provider/cloudfront/zz_main.go index e52afac44b..322dc53724 100644 --- a/cmd/provider/cloudfront/zz_main.go +++ b/cmd/provider/cloudfront/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_cloudfront(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/cloudsearch/zz_main.go b/cmd/provider/cloudsearch/zz_main.go index 6a5f458034..26f497ee6f 100644 --- a/cmd/provider/cloudsearch/zz_main.go +++ b/cmd/provider/cloudsearch/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_cloudsearch(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/cloudtrail/zz_main.go b/cmd/provider/cloudtrail/zz_main.go index 75f681b07c..81d74cac65 100644 --- a/cmd/provider/cloudtrail/zz_main.go +++ b/cmd/provider/cloudtrail/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_cloudtrail(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/cloudwatch/zz_main.go b/cmd/provider/cloudwatch/zz_main.go index 91eb59e130..e5318b6dea 100644 --- a/cmd/provider/cloudwatch/zz_main.go +++ b/cmd/provider/cloudwatch/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_cloudwatch(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/cloudwatchevents/zz_main.go b/cmd/provider/cloudwatchevents/zz_main.go index 34b36998bc..ba999b3449 100644 --- a/cmd/provider/cloudwatchevents/zz_main.go +++ b/cmd/provider/cloudwatchevents/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_cloudwatchevents(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/cloudwatchlogs/zz_main.go b/cmd/provider/cloudwatchlogs/zz_main.go index 893a2ceb17..e2e460f0e4 100644 --- a/cmd/provider/cloudwatchlogs/zz_main.go +++ b/cmd/provider/cloudwatchlogs/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_cloudwatchlogs(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/codeartifact/zz_main.go b/cmd/provider/codeartifact/zz_main.go index 4c438457ba..96dbcfde9c 100644 --- a/cmd/provider/codeartifact/zz_main.go +++ b/cmd/provider/codeartifact/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_codeartifact(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/codecommit/zz_main.go b/cmd/provider/codecommit/zz_main.go index aaff2e07fe..9eb11fec6b 100644 --- a/cmd/provider/codecommit/zz_main.go +++ b/cmd/provider/codecommit/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_codecommit(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/codeguruprofiler/zz_main.go b/cmd/provider/codeguruprofiler/zz_main.go index 1243eab5f1..9e87db1652 100644 --- a/cmd/provider/codeguruprofiler/zz_main.go +++ b/cmd/provider/codeguruprofiler/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_codeguruprofiler(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/codepipeline/zz_main.go b/cmd/provider/codepipeline/zz_main.go index a36505b5da..53417aa4bf 100644 --- a/cmd/provider/codepipeline/zz_main.go +++ b/cmd/provider/codepipeline/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_codepipeline(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/codestarconnections/zz_main.go b/cmd/provider/codestarconnections/zz_main.go index 99e467f367..e42f445f33 100644 --- a/cmd/provider/codestarconnections/zz_main.go +++ b/cmd/provider/codestarconnections/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_codestarconnections(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/codestarnotifications/zz_main.go b/cmd/provider/codestarnotifications/zz_main.go index 739f2cb7fa..1deb6598bb 100644 --- a/cmd/provider/codestarnotifications/zz_main.go +++ b/cmd/provider/codestarnotifications/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_codestarnotifications(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/cognitoidentity/zz_main.go b/cmd/provider/cognitoidentity/zz_main.go index 2b609d79b1..9b1bcb6695 100644 --- a/cmd/provider/cognitoidentity/zz_main.go +++ b/cmd/provider/cognitoidentity/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_cognitoidentity(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/cognitoidp/zz_main.go b/cmd/provider/cognitoidp/zz_main.go index 55dbdbbf83..ecf660b553 100644 --- a/cmd/provider/cognitoidp/zz_main.go +++ b/cmd/provider/cognitoidp/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_cognitoidp(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/config/zz_main.go b/cmd/provider/config/zz_main.go index 1943052086..9693288400 100644 --- a/cmd/provider/config/zz_main.go +++ b/cmd/provider/config/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_config(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/configservice/zz_main.go b/cmd/provider/configservice/zz_main.go index 20d86fe64a..2dad626b00 100644 --- a/cmd/provider/configservice/zz_main.go +++ b/cmd/provider/configservice/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_configservice(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/connect/zz_main.go b/cmd/provider/connect/zz_main.go index b63eb1eede..4b48f24d8f 100644 --- a/cmd/provider/connect/zz_main.go +++ b/cmd/provider/connect/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_connect(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/cur/zz_main.go b/cmd/provider/cur/zz_main.go index 83c7edb9e4..c712c6ff90 100644 --- a/cmd/provider/cur/zz_main.go +++ b/cmd/provider/cur/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_cur(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/dataexchange/zz_main.go b/cmd/provider/dataexchange/zz_main.go index 6852ff0b2d..c0c77908c7 100644 --- a/cmd/provider/dataexchange/zz_main.go +++ b/cmd/provider/dataexchange/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_dataexchange(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/datapipeline/zz_main.go b/cmd/provider/datapipeline/zz_main.go index eaa2a30289..276be2689a 100644 --- a/cmd/provider/datapipeline/zz_main.go +++ b/cmd/provider/datapipeline/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_datapipeline(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/datasync/zz_main.go b/cmd/provider/datasync/zz_main.go index 527256b644..b811415430 100644 --- a/cmd/provider/datasync/zz_main.go +++ b/cmd/provider/datasync/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_datasync(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/dax/zz_main.go b/cmd/provider/dax/zz_main.go index 5460deaef3..6e04449ed7 100644 --- a/cmd/provider/dax/zz_main.go +++ b/cmd/provider/dax/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_dax(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/deploy/zz_main.go b/cmd/provider/deploy/zz_main.go index f1b4e5dd53..168732a959 100644 --- a/cmd/provider/deploy/zz_main.go +++ b/cmd/provider/deploy/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_deploy(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/detective/zz_main.go b/cmd/provider/detective/zz_main.go index 3f3d539872..8fbc954579 100644 --- a/cmd/provider/detective/zz_main.go +++ b/cmd/provider/detective/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_detective(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/devicefarm/zz_main.go b/cmd/provider/devicefarm/zz_main.go index 6664b5a640..10cb4fab4e 100644 --- a/cmd/provider/devicefarm/zz_main.go +++ b/cmd/provider/devicefarm/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_devicefarm(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/directconnect/zz_main.go b/cmd/provider/directconnect/zz_main.go index 7373c418df..3a3ef7c3a6 100644 --- a/cmd/provider/directconnect/zz_main.go +++ b/cmd/provider/directconnect/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_directconnect(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/dlm/zz_main.go b/cmd/provider/dlm/zz_main.go index c759d05eb6..d56bce02dd 100644 --- a/cmd/provider/dlm/zz_main.go +++ b/cmd/provider/dlm/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_dlm(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/dms/zz_main.go b/cmd/provider/dms/zz_main.go index 221a570fe2..f43a6abbba 100644 --- a/cmd/provider/dms/zz_main.go +++ b/cmd/provider/dms/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_dms(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/docdb/zz_main.go b/cmd/provider/docdb/zz_main.go index 8b120a515a..4eafb64a93 100644 --- a/cmd/provider/docdb/zz_main.go +++ b/cmd/provider/docdb/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_docdb(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/ds/zz_main.go b/cmd/provider/ds/zz_main.go index 4a886f33c1..4e136bab35 100644 --- a/cmd/provider/ds/zz_main.go +++ b/cmd/provider/ds/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_ds(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/dynamodb/zz_main.go b/cmd/provider/dynamodb/zz_main.go index 7950c07367..f17517263b 100644 --- a/cmd/provider/dynamodb/zz_main.go +++ b/cmd/provider/dynamodb/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_dynamodb(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/ec2/zz_main.go b/cmd/provider/ec2/zz_main.go index 13de449ec2..0e0d63a2cd 100644 --- a/cmd/provider/ec2/zz_main.go +++ b/cmd/provider/ec2/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_ec2(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/ecr/zz_main.go b/cmd/provider/ecr/zz_main.go index 6da539be08..d7d84db8f4 100644 --- a/cmd/provider/ecr/zz_main.go +++ b/cmd/provider/ecr/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_ecr(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/ecrpublic/zz_main.go b/cmd/provider/ecrpublic/zz_main.go index f98c644f46..657562d94e 100644 --- a/cmd/provider/ecrpublic/zz_main.go +++ b/cmd/provider/ecrpublic/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_ecrpublic(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/ecs/zz_main.go b/cmd/provider/ecs/zz_main.go index aca36facea..1ec3e75ed1 100644 --- a/cmd/provider/ecs/zz_main.go +++ b/cmd/provider/ecs/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_ecs(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/efs/zz_main.go b/cmd/provider/efs/zz_main.go index eec397ba90..ece27cd451 100644 --- a/cmd/provider/efs/zz_main.go +++ b/cmd/provider/efs/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_efs(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/eks/zz_main.go b/cmd/provider/eks/zz_main.go index b1224bab3d..01ce2104c5 100644 --- a/cmd/provider/eks/zz_main.go +++ b/cmd/provider/eks/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_eks(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/elasticache/zz_main.go b/cmd/provider/elasticache/zz_main.go index ab37aedb00..a7a27be040 100644 --- a/cmd/provider/elasticache/zz_main.go +++ b/cmd/provider/elasticache/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_elasticache(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/elasticbeanstalk/zz_main.go b/cmd/provider/elasticbeanstalk/zz_main.go index 0d796c5325..608d029177 100644 --- a/cmd/provider/elasticbeanstalk/zz_main.go +++ b/cmd/provider/elasticbeanstalk/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_elasticbeanstalk(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/elasticsearch/zz_main.go b/cmd/provider/elasticsearch/zz_main.go index e9003f303a..106b86d73c 100644 --- a/cmd/provider/elasticsearch/zz_main.go +++ b/cmd/provider/elasticsearch/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_elasticsearch(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/elastictranscoder/zz_main.go b/cmd/provider/elastictranscoder/zz_main.go index 04504e7d3f..58913d5ba8 100644 --- a/cmd/provider/elastictranscoder/zz_main.go +++ b/cmd/provider/elastictranscoder/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_elastictranscoder(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/elb/zz_main.go b/cmd/provider/elb/zz_main.go index 1ef23be91b..dc7f9e6a76 100644 --- a/cmd/provider/elb/zz_main.go +++ b/cmd/provider/elb/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_elb(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/elbv2/zz_main.go b/cmd/provider/elbv2/zz_main.go index 087695f6d6..44d6ac3e3b 100644 --- a/cmd/provider/elbv2/zz_main.go +++ b/cmd/provider/elbv2/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_elbv2(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/emr/zz_main.go b/cmd/provider/emr/zz_main.go index 78eabe4fd9..bf7bfeb920 100644 --- a/cmd/provider/emr/zz_main.go +++ b/cmd/provider/emr/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_emr(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/emrserverless/zz_main.go b/cmd/provider/emrserverless/zz_main.go index 6e364bc7bb..13b2375658 100644 --- a/cmd/provider/emrserverless/zz_main.go +++ b/cmd/provider/emrserverless/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_emrserverless(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/evidently/zz_main.go b/cmd/provider/evidently/zz_main.go index 2575330388..30dbbe52f0 100644 --- a/cmd/provider/evidently/zz_main.go +++ b/cmd/provider/evidently/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_evidently(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/firehose/zz_main.go b/cmd/provider/firehose/zz_main.go index f82b3283f9..5a3b8620a4 100644 --- a/cmd/provider/firehose/zz_main.go +++ b/cmd/provider/firehose/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_firehose(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/fis/zz_main.go b/cmd/provider/fis/zz_main.go index 6418b9cbf8..9f9adfa184 100644 --- a/cmd/provider/fis/zz_main.go +++ b/cmd/provider/fis/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_fis(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/fsx/zz_main.go b/cmd/provider/fsx/zz_main.go index 45a69f42df..de60cc84fd 100644 --- a/cmd/provider/fsx/zz_main.go +++ b/cmd/provider/fsx/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_fsx(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/gamelift/zz_main.go b/cmd/provider/gamelift/zz_main.go index 2cfb861043..ff44d34dd9 100644 --- a/cmd/provider/gamelift/zz_main.go +++ b/cmd/provider/gamelift/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_gamelift(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/glacier/zz_main.go b/cmd/provider/glacier/zz_main.go index 727c16da7e..c376e5c702 100644 --- a/cmd/provider/glacier/zz_main.go +++ b/cmd/provider/glacier/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_glacier(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/globalaccelerator/zz_main.go b/cmd/provider/globalaccelerator/zz_main.go index 7adde9a32b..ab0ba437d8 100644 --- a/cmd/provider/globalaccelerator/zz_main.go +++ b/cmd/provider/globalaccelerator/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_globalaccelerator(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/glue/zz_main.go b/cmd/provider/glue/zz_main.go index da4712249e..464a39b0f9 100644 --- a/cmd/provider/glue/zz_main.go +++ b/cmd/provider/glue/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_glue(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/grafana/zz_main.go b/cmd/provider/grafana/zz_main.go index c3858d0dd3..be8dba4cfb 100644 --- a/cmd/provider/grafana/zz_main.go +++ b/cmd/provider/grafana/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_grafana(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/guardduty/zz_main.go b/cmd/provider/guardduty/zz_main.go index ae89b48ccc..e9126fe5a3 100644 --- a/cmd/provider/guardduty/zz_main.go +++ b/cmd/provider/guardduty/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_guardduty(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/iam/zz_main.go b/cmd/provider/iam/zz_main.go index bed8ea3479..71c34e4724 100644 --- a/cmd/provider/iam/zz_main.go +++ b/cmd/provider/iam/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_iam(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/identitystore/zz_main.go b/cmd/provider/identitystore/zz_main.go index 4757893b1d..4e12cc8375 100644 --- a/cmd/provider/identitystore/zz_main.go +++ b/cmd/provider/identitystore/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_identitystore(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/imagebuilder/zz_main.go b/cmd/provider/imagebuilder/zz_main.go index 2761955c99..fefd069a55 100644 --- a/cmd/provider/imagebuilder/zz_main.go +++ b/cmd/provider/imagebuilder/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_imagebuilder(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/inspector/zz_main.go b/cmd/provider/inspector/zz_main.go index bfc33cf863..8b6ac0af3c 100644 --- a/cmd/provider/inspector/zz_main.go +++ b/cmd/provider/inspector/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_inspector(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/inspector2/zz_main.go b/cmd/provider/inspector2/zz_main.go index adb500c32f..9d53514c6f 100644 --- a/cmd/provider/inspector2/zz_main.go +++ b/cmd/provider/inspector2/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_inspector2(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/iot/zz_main.go b/cmd/provider/iot/zz_main.go index 0552923b72..a89d9652f9 100644 --- a/cmd/provider/iot/zz_main.go +++ b/cmd/provider/iot/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_iot(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/ivs/zz_main.go b/cmd/provider/ivs/zz_main.go index 74a9158ea4..936a2589af 100644 --- a/cmd/provider/ivs/zz_main.go +++ b/cmd/provider/ivs/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_ivs(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/kafka/zz_main.go b/cmd/provider/kafka/zz_main.go index 199e6185ce..238bcc9c25 100644 --- a/cmd/provider/kafka/zz_main.go +++ b/cmd/provider/kafka/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_kafka(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/kafkaconnect/zz_main.go b/cmd/provider/kafkaconnect/zz_main.go index e700522898..f3a214c9bc 100644 --- a/cmd/provider/kafkaconnect/zz_main.go +++ b/cmd/provider/kafkaconnect/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_kafkaconnect(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/kendra/zz_main.go b/cmd/provider/kendra/zz_main.go index f7e61068e0..e699772292 100644 --- a/cmd/provider/kendra/zz_main.go +++ b/cmd/provider/kendra/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_kendra(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/keyspaces/zz_main.go b/cmd/provider/keyspaces/zz_main.go index dec7e2099f..60cca5f1f5 100644 --- a/cmd/provider/keyspaces/zz_main.go +++ b/cmd/provider/keyspaces/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_keyspaces(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/kinesis/zz_main.go b/cmd/provider/kinesis/zz_main.go index a62ba61da9..69ed6e7023 100644 --- a/cmd/provider/kinesis/zz_main.go +++ b/cmd/provider/kinesis/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_kinesis(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/kinesisanalytics/zz_main.go b/cmd/provider/kinesisanalytics/zz_main.go index 7975c1e14e..cb6d98c085 100644 --- a/cmd/provider/kinesisanalytics/zz_main.go +++ b/cmd/provider/kinesisanalytics/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_kinesisanalytics(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/kinesisanalyticsv2/zz_main.go b/cmd/provider/kinesisanalyticsv2/zz_main.go index f84e6a2319..c29d1bbb0a 100644 --- a/cmd/provider/kinesisanalyticsv2/zz_main.go +++ b/cmd/provider/kinesisanalyticsv2/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_kinesisanalyticsv2(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/kinesisvideo/zz_main.go b/cmd/provider/kinesisvideo/zz_main.go index b11b44a5ce..6750257407 100644 --- a/cmd/provider/kinesisvideo/zz_main.go +++ b/cmd/provider/kinesisvideo/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_kinesisvideo(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/kms/zz_main.go b/cmd/provider/kms/zz_main.go index 79cf07f2f9..e2450328c2 100644 --- a/cmd/provider/kms/zz_main.go +++ b/cmd/provider/kms/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_kms(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/lakeformation/zz_main.go b/cmd/provider/lakeformation/zz_main.go index 8472800424..330d24ed48 100644 --- a/cmd/provider/lakeformation/zz_main.go +++ b/cmd/provider/lakeformation/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_lakeformation(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/lambda/zz_main.go b/cmd/provider/lambda/zz_main.go index 4e19cd507c..d046a30f75 100644 --- a/cmd/provider/lambda/zz_main.go +++ b/cmd/provider/lambda/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_lambda(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/lexmodels/zz_main.go b/cmd/provider/lexmodels/zz_main.go index 1a0ef96a0a..6e5d8a7490 100644 --- a/cmd/provider/lexmodels/zz_main.go +++ b/cmd/provider/lexmodels/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_lexmodels(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/licensemanager/zz_main.go b/cmd/provider/licensemanager/zz_main.go index 2fdc7af224..e4543056ab 100644 --- a/cmd/provider/licensemanager/zz_main.go +++ b/cmd/provider/licensemanager/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_licensemanager(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/lightsail/zz_main.go b/cmd/provider/lightsail/zz_main.go index 15e0203ad4..394db60941 100644 --- a/cmd/provider/lightsail/zz_main.go +++ b/cmd/provider/lightsail/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_lightsail(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/location/zz_main.go b/cmd/provider/location/zz_main.go index 1940478152..33664d54bb 100644 --- a/cmd/provider/location/zz_main.go +++ b/cmd/provider/location/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_location(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/macie2/zz_main.go b/cmd/provider/macie2/zz_main.go index 7d482abc67..51fc6fde1a 100644 --- a/cmd/provider/macie2/zz_main.go +++ b/cmd/provider/macie2/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_macie2(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/mediaconvert/zz_main.go b/cmd/provider/mediaconvert/zz_main.go index e70ffda625..035f29f0aa 100644 --- a/cmd/provider/mediaconvert/zz_main.go +++ b/cmd/provider/mediaconvert/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_mediaconvert(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/medialive/zz_main.go b/cmd/provider/medialive/zz_main.go index 3cff6b9fe2..29dabd9807 100644 --- a/cmd/provider/medialive/zz_main.go +++ b/cmd/provider/medialive/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_medialive(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/mediapackage/zz_main.go b/cmd/provider/mediapackage/zz_main.go index 326ba96f5c..c8e47b5676 100644 --- a/cmd/provider/mediapackage/zz_main.go +++ b/cmd/provider/mediapackage/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_mediapackage(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/mediastore/zz_main.go b/cmd/provider/mediastore/zz_main.go index f27b166c5c..9bab5f4b42 100644 --- a/cmd/provider/mediastore/zz_main.go +++ b/cmd/provider/mediastore/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_mediastore(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/memorydb/zz_main.go b/cmd/provider/memorydb/zz_main.go index ce75c086c0..01fc45b8f7 100644 --- a/cmd/provider/memorydb/zz_main.go +++ b/cmd/provider/memorydb/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_memorydb(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/monolith/zz_main.go b/cmd/provider/monolith/zz_main.go index 604f37a5a0..2f41f43456 100644 --- a/cmd/provider/monolith/zz_main.go +++ b/cmd/provider/monolith/zz_main.go @@ -222,7 +222,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_monolith(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/mq/zz_main.go b/cmd/provider/mq/zz_main.go index 0b46f8ab69..1923dd6ea7 100644 --- a/cmd/provider/mq/zz_main.go +++ b/cmd/provider/mq/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_mq(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/mwaa/zz_main.go b/cmd/provider/mwaa/zz_main.go index 252518c4e5..1eed3ab479 100644 --- a/cmd/provider/mwaa/zz_main.go +++ b/cmd/provider/mwaa/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_mwaa(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/neptune/zz_main.go b/cmd/provider/neptune/zz_main.go index 4a55e191c1..35f52d39d9 100644 --- a/cmd/provider/neptune/zz_main.go +++ b/cmd/provider/neptune/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_neptune(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/networkfirewall/zz_main.go b/cmd/provider/networkfirewall/zz_main.go index fa48e22632..23b05279b9 100644 --- a/cmd/provider/networkfirewall/zz_main.go +++ b/cmd/provider/networkfirewall/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_networkfirewall(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/networkmanager/zz_main.go b/cmd/provider/networkmanager/zz_main.go index 656c7b5924..04e05a46ce 100644 --- a/cmd/provider/networkmanager/zz_main.go +++ b/cmd/provider/networkmanager/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_networkmanager(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/opensearch/zz_main.go b/cmd/provider/opensearch/zz_main.go index 14e428cf05..2f7626803f 100644 --- a/cmd/provider/opensearch/zz_main.go +++ b/cmd/provider/opensearch/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_opensearch(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/opensearchserverless/zz_main.go b/cmd/provider/opensearchserverless/zz_main.go index a86d548708..13c1ab1366 100644 --- a/cmd/provider/opensearchserverless/zz_main.go +++ b/cmd/provider/opensearchserverless/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_opensearchserverless(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/opsworks/zz_main.go b/cmd/provider/opsworks/zz_main.go index d628c18935..ac78743d42 100644 --- a/cmd/provider/opsworks/zz_main.go +++ b/cmd/provider/opsworks/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_opsworks(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/organizations/zz_main.go b/cmd/provider/organizations/zz_main.go index 706736bd46..8764b83743 100644 --- a/cmd/provider/organizations/zz_main.go +++ b/cmd/provider/organizations/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_organizations(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/pinpoint/zz_main.go b/cmd/provider/pinpoint/zz_main.go index ded372405c..8c3fb352c4 100644 --- a/cmd/provider/pinpoint/zz_main.go +++ b/cmd/provider/pinpoint/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_pinpoint(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/qldb/zz_main.go b/cmd/provider/qldb/zz_main.go index b0f8c8c9f8..77c92e0d6c 100644 --- a/cmd/provider/qldb/zz_main.go +++ b/cmd/provider/qldb/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_qldb(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/quicksight/zz_main.go b/cmd/provider/quicksight/zz_main.go index 76638e1dad..09a0322ebd 100644 --- a/cmd/provider/quicksight/zz_main.go +++ b/cmd/provider/quicksight/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_quicksight(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/ram/zz_main.go b/cmd/provider/ram/zz_main.go index 45c71cf9f2..b9e8212a54 100644 --- a/cmd/provider/ram/zz_main.go +++ b/cmd/provider/ram/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_ram(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/rds/zz_main.go b/cmd/provider/rds/zz_main.go index 6c3386436e..8ec73af791 100644 --- a/cmd/provider/rds/zz_main.go +++ b/cmd/provider/rds/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_rds(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/redshift/zz_main.go b/cmd/provider/redshift/zz_main.go index 616ba38541..49b118cd57 100644 --- a/cmd/provider/redshift/zz_main.go +++ b/cmd/provider/redshift/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_redshift(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/redshiftserverless/zz_main.go b/cmd/provider/redshiftserverless/zz_main.go index b3747b9bfc..6aa74f73d8 100644 --- a/cmd/provider/redshiftserverless/zz_main.go +++ b/cmd/provider/redshiftserverless/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_redshiftserverless(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/resourcegroups/zz_main.go b/cmd/provider/resourcegroups/zz_main.go index 8402457936..fe303b909f 100644 --- a/cmd/provider/resourcegroups/zz_main.go +++ b/cmd/provider/resourcegroups/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_resourcegroups(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/rolesanywhere/zz_main.go b/cmd/provider/rolesanywhere/zz_main.go index 9968bccdf3..fdfb49ff93 100644 --- a/cmd/provider/rolesanywhere/zz_main.go +++ b/cmd/provider/rolesanywhere/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_rolesanywhere(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/route53/zz_main.go b/cmd/provider/route53/zz_main.go index 781e610b22..b45d1e845e 100644 --- a/cmd/provider/route53/zz_main.go +++ b/cmd/provider/route53/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_route53(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/route53recoverycontrolconfig/zz_main.go b/cmd/provider/route53recoverycontrolconfig/zz_main.go index 66e9db31bf..3df45c2257 100644 --- a/cmd/provider/route53recoverycontrolconfig/zz_main.go +++ b/cmd/provider/route53recoverycontrolconfig/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_route53recoverycontrolconfig(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/route53recoveryreadiness/zz_main.go b/cmd/provider/route53recoveryreadiness/zz_main.go index 4f6e53fd91..dd928e8d2e 100644 --- a/cmd/provider/route53recoveryreadiness/zz_main.go +++ b/cmd/provider/route53recoveryreadiness/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_route53recoveryreadiness(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/route53resolver/zz_main.go b/cmd/provider/route53resolver/zz_main.go index c3e8be33bc..73b3a30eea 100644 --- a/cmd/provider/route53resolver/zz_main.go +++ b/cmd/provider/route53resolver/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_route53resolver(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/rum/zz_main.go b/cmd/provider/rum/zz_main.go index 84db41ee57..e09e3ca0e6 100644 --- a/cmd/provider/rum/zz_main.go +++ b/cmd/provider/rum/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_rum(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/s3/zz_main.go b/cmd/provider/s3/zz_main.go index 1c1b1224a4..288e4ba96f 100644 --- a/cmd/provider/s3/zz_main.go +++ b/cmd/provider/s3/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_s3(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/s3control/zz_main.go b/cmd/provider/s3control/zz_main.go index 744d3f995d..64336b7986 100644 --- a/cmd/provider/s3control/zz_main.go +++ b/cmd/provider/s3control/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_s3control(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/sagemaker/zz_main.go b/cmd/provider/sagemaker/zz_main.go index 367c6fbd13..9f1e6be09b 100644 --- a/cmd/provider/sagemaker/zz_main.go +++ b/cmd/provider/sagemaker/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_sagemaker(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/scheduler/zz_main.go b/cmd/provider/scheduler/zz_main.go index 13058dac02..9509adcdd9 100644 --- a/cmd/provider/scheduler/zz_main.go +++ b/cmd/provider/scheduler/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_scheduler(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/schemas/zz_main.go b/cmd/provider/schemas/zz_main.go index a8544a5806..86750f8630 100644 --- a/cmd/provider/schemas/zz_main.go +++ b/cmd/provider/schemas/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_schemas(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/secretsmanager/zz_main.go b/cmd/provider/secretsmanager/zz_main.go index 46e9537f2a..89f8c0f430 100644 --- a/cmd/provider/secretsmanager/zz_main.go +++ b/cmd/provider/secretsmanager/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_secretsmanager(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/securityhub/zz_main.go b/cmd/provider/securityhub/zz_main.go index 3384a4b68f..0a2373a0db 100644 --- a/cmd/provider/securityhub/zz_main.go +++ b/cmd/provider/securityhub/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_securityhub(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/serverlessrepo/zz_main.go b/cmd/provider/serverlessrepo/zz_main.go index 83e907efeb..e5165e2b2e 100644 --- a/cmd/provider/serverlessrepo/zz_main.go +++ b/cmd/provider/serverlessrepo/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_serverlessrepo(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/servicecatalog/zz_main.go b/cmd/provider/servicecatalog/zz_main.go index c9dfc33f3d..994266370f 100644 --- a/cmd/provider/servicecatalog/zz_main.go +++ b/cmd/provider/servicecatalog/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_servicecatalog(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/servicediscovery/zz_main.go b/cmd/provider/servicediscovery/zz_main.go index a02b008370..f2ad2848f8 100644 --- a/cmd/provider/servicediscovery/zz_main.go +++ b/cmd/provider/servicediscovery/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_servicediscovery(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/servicequotas/zz_main.go b/cmd/provider/servicequotas/zz_main.go index 67f090e330..9d55252b90 100644 --- a/cmd/provider/servicequotas/zz_main.go +++ b/cmd/provider/servicequotas/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_servicequotas(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/ses/zz_main.go b/cmd/provider/ses/zz_main.go index 98613eb0d7..95fef94592 100644 --- a/cmd/provider/ses/zz_main.go +++ b/cmd/provider/ses/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_ses(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/sesv2/zz_main.go b/cmd/provider/sesv2/zz_main.go index 5f7e95f701..f3771caf6d 100644 --- a/cmd/provider/sesv2/zz_main.go +++ b/cmd/provider/sesv2/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_sesv2(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/sfn/zz_main.go b/cmd/provider/sfn/zz_main.go index 14ac140aca..041045417c 100644 --- a/cmd/provider/sfn/zz_main.go +++ b/cmd/provider/sfn/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_sfn(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/signer/zz_main.go b/cmd/provider/signer/zz_main.go index 6778dffd30..7ab012a930 100644 --- a/cmd/provider/signer/zz_main.go +++ b/cmd/provider/signer/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_signer(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/simpledb/zz_main.go b/cmd/provider/simpledb/zz_main.go index f45a94a69f..159ca089b5 100644 --- a/cmd/provider/simpledb/zz_main.go +++ b/cmd/provider/simpledb/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_simpledb(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/sns/zz_main.go b/cmd/provider/sns/zz_main.go index 58348fb2ab..f6143d43e0 100644 --- a/cmd/provider/sns/zz_main.go +++ b/cmd/provider/sns/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_sns(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/sqs/zz_main.go b/cmd/provider/sqs/zz_main.go index a97baa70b9..ae6dfeefd3 100644 --- a/cmd/provider/sqs/zz_main.go +++ b/cmd/provider/sqs/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_sqs(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/ssm/zz_main.go b/cmd/provider/ssm/zz_main.go index 535b623908..f6d93169bc 100644 --- a/cmd/provider/ssm/zz_main.go +++ b/cmd/provider/ssm/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_ssm(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/ssoadmin/zz_main.go b/cmd/provider/ssoadmin/zz_main.go index d8f0954a15..5e7597a988 100644 --- a/cmd/provider/ssoadmin/zz_main.go +++ b/cmd/provider/ssoadmin/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_ssoadmin(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/swf/zz_main.go b/cmd/provider/swf/zz_main.go index 8808200cb9..83c49fc512 100644 --- a/cmd/provider/swf/zz_main.go +++ b/cmd/provider/swf/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_swf(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/timestreamwrite/zz_main.go b/cmd/provider/timestreamwrite/zz_main.go index 943b145687..14eafa5d30 100644 --- a/cmd/provider/timestreamwrite/zz_main.go +++ b/cmd/provider/timestreamwrite/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_timestreamwrite(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/transcribe/zz_main.go b/cmd/provider/transcribe/zz_main.go index 015a0e0437..c61ceb6b73 100644 --- a/cmd/provider/transcribe/zz_main.go +++ b/cmd/provider/transcribe/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_transcribe(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/transfer/zz_main.go b/cmd/provider/transfer/zz_main.go index 0169846866..7bb54b443e 100644 --- a/cmd/provider/transfer/zz_main.go +++ b/cmd/provider/transfer/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_transfer(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/vpc/zz_main.go b/cmd/provider/vpc/zz_main.go index f690a71aff..a5658a4cfa 100644 --- a/cmd/provider/vpc/zz_main.go +++ b/cmd/provider/vpc/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_vpc(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/waf/zz_main.go b/cmd/provider/waf/zz_main.go index 8bb267630a..74115b093a 100644 --- a/cmd/provider/waf/zz_main.go +++ b/cmd/provider/waf/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_waf(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/wafregional/zz_main.go b/cmd/provider/wafregional/zz_main.go index b06e47123d..caf407cd6b 100644 --- a/cmd/provider/wafregional/zz_main.go +++ b/cmd/provider/wafregional/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_wafregional(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/wafv2/zz_main.go b/cmd/provider/wafv2/zz_main.go index c39c0b9222..2b3ffaf12e 100644 --- a/cmd/provider/wafv2/zz_main.go +++ b/cmd/provider/wafv2/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_wafv2(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/workspaces/zz_main.go b/cmd/provider/workspaces/zz_main.go index 37b4e2b27a..2aeb853586 100644 --- a/cmd/provider/workspaces/zz_main.go +++ b/cmd/provider/workspaces/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_workspaces(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/cmd/provider/xray/zz_main.go b/cmd/provider/xray/zz_main.go index 1d53a9e7d8..e3fdc0ae75 100644 --- a/cmd/provider/xray/zz_main.go +++ b/cmd/provider/xray/zz_main.go @@ -217,7 +217,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_xray(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/config/field-rename.yaml b/config/field-rename.yaml index 6924efb98b..3119d40dec 100644 --- a/config/field-rename.yaml +++ b/config/field-rename.yaml @@ -30,3 +30,15 @@ aws_route: spec.forProvider.instanceId: spec.forProvider.networkInterfaceId spec.initProvider.instanceId: spec.initProvider.networkInterfaceId + +- sourceVersion: "v1beta1" + targetVersion: "v1beta3" + data: + aws_connect_hours_of_operation: + status.atProvider.hoursOfOperationArn: status.atProvider.arn + aws_connect_queue: + status.atProvider.quickConnectIdsAssociated: status.atProvider.quickConnectIds + aws_db_instance: + spec.forProvider.name: spec.forProvider.dbName + spec.initProvider.name: spec.initProvider.dbName + status.atProvider.name: status.atProvider.dbName diff --git a/config/registry.go b/config/registry.go index edfb888f56..4048bddbdf 100644 --- a/config/registry.go +++ b/config/registry.go @@ -21,6 +21,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-provider-aws/xpprovider" "github.com/pkg/errors" + "k8s.io/apimachinery/pkg/util/sets" "github.com/upbound/provider-aws/hack" ) @@ -206,11 +207,21 @@ func bumpVersionsWithEmbeddedLists(pc *config.Provider) error { } func configureSingletonListAPIConverters(r *config.Resource) error { - bumped, err := bumpAPIVersion(r.Version) - if err != nil { - return errors.Wrapf(err, errFmtCannotBumpSingletonList, r.Name) + bumped := r.Version + currentVer := "v1beta2" + var err error + // field renamings for these three resources already bump their versions. + // Please see config.injectFieldRenamingConversionFunctions. + // We do not bump their versions again here. + if !sets.New("aws_connect_hours_of_operation", "aws_connect_queue", "aws_db_instance").Has(r.Name) { + bumped, err = bumpAPIVersion(r.Version) + if err != nil { + return errors.Wrapf(err, errFmtCannotBumpSingletonList, r.Name) + } + currentVer = r.Version } + r.Version = bumped if r.PreviousVersions == nil { prev, err := getPreviousVersions(bumped) if err != nil { @@ -218,18 +229,22 @@ func configureSingletonListAPIConverters(r *config.Resource) error { } r.PreviousVersions = prev } - currentVer := r.Version - r.Version = bumped // we would like to set the storage version to v1beta1 to facilitate // downgrades. r.SetCRDStorageVersion(currentVer) // because the controller reconciles on the API version with the singleton list API, // no need for a Terraform conversion. r.ControllerReconcileVersion = currentVer - r.Conversions = []conversion.Conversion{ + // assumes the first element is the identity conversion from + // the default resource and removes it because we will register another + // identity converter below. + r.Conversions = r.Conversions[1:] + + r.Conversions = append([]conversion.Conversion{ conversion.NewIdentityConversionExpandPaths(conversion.AllVersions, conversion.AllVersions, conversion.DefaultPathPrefixes(), r.CRDListConversionPaths()...), conversion.NewSingletonListConversion(conversion.AllVersions, bumped, conversion.DefaultPathPrefixes(), r.CRDListConversionPaths(), conversion.ToEmbeddedObject), - conversion.NewSingletonListConversion(bumped, conversion.AllVersions, conversion.DefaultPathPrefixes(), r.CRDListConversionPaths(), conversion.ToSingletonList)} + conversion.NewSingletonListConversion(bumped, conversion.AllVersions, conversion.DefaultPathPrefixes(), r.CRDListConversionPaths(), conversion.ToSingletonList)}, + r.Conversions...) return nil } diff --git a/go.mod b/go.mod index 24dd7bfab7..f843211b36 100644 --- a/go.mod +++ b/go.mod @@ -365,3 +365,5 @@ require ( replace github.com/hashicorp/terraform-plugin-log => github.com/gdavison/terraform-plugin-log v0.0.0-20230928191232-6c653d8ef8fb replace github.com/hashicorp/terraform-provider-aws => github.com/upbound/terraform-provider-aws v0.0.0-20240523140457-101595b8576e + +replace github.com/crossplane/upjet => github.com/ulucinar/upbound-upjet v0.0.0-20240725105816-e489efa71796 diff --git a/go.sum b/go.sum index 82f9ebcd26..f63d1faa23 100644 --- a/go.sum +++ b/go.sum @@ -424,8 +424,6 @@ github.com/crossplane/crossplane-runtime v1.16.0-rc.2.0.20240510094504-3f697876f github.com/crossplane/crossplane-runtime v1.16.0-rc.2.0.20240510094504-3f697876fa57/go.mod h1:Pz2tdGVMF6KDGzHZOkvKro0nKc8EzK0sb/nSA7pH4Dc= github.com/crossplane/crossplane-tools v0.0.0-20230925130601-628280f8bf79 h1:HigXs5tEQxWz0fcj8hzbU2UAZgEM7wPe0XRFOsrtF8Y= github.com/crossplane/crossplane-tools v0.0.0-20230925130601-628280f8bf79/go.mod h1:+e4OaFlOcmr0JvINHl/yvEYBrZawzTgj6pQumOH1SS0= -github.com/crossplane/upjet v1.4.1-0.20240612123927-37c7f4e91d57 h1:hyKXccOb8BepVJj79KsvwYsid5Lhlr2DojO29Sqi+rw= -github.com/crossplane/upjet v1.4.1-0.20240612123927-37c7f4e91d57/go.mod h1:wkdZf/Cvhr6PI30VdHIOjg4dX39Z5uijqnLWFk5PbGM= github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= github.com/dave/jennifer v1.4.1 h1:XyqG6cn5RQsTj3qlWQTKlRGAyrTcsk1kUmWdZBzRjDw= @@ -714,6 +712,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/tmccombs/hcl2json v0.3.3 h1:+DLNYqpWE0CsOQiEZu+OZm5ZBImake3wtITYxQ8uLFQ= github.com/tmccombs/hcl2json v0.3.3/go.mod h1:Y2chtz2x9bAeRTvSibVRVgbLJhLJXKlUeIvjeVdnm4w= +github.com/ulucinar/upbound-upjet v0.0.0-20240725105816-e489efa71796 h1:Citi+rZlgY8c5GGKNvE0UVBLjRdM4JmLvqyzQOo5USU= +github.com/ulucinar/upbound-upjet v0.0.0-20240725105816-e489efa71796/go.mod h1:wkdZf/Cvhr6PI30VdHIOjg4dX39Z5uijqnLWFk5PbGM= github.com/upbound/terraform-provider-aws v0.0.0-20240523140457-101595b8576e h1:Oq2PA7E9F52eMoc8vAqKMffek7gqymBSiXd5kiitHbE= github.com/upbound/terraform-provider-aws v0.0.0-20240523140457-101595b8576e/go.mod h1:yWeBcsPCtmEKOurig3GUxpnbQnw8AbEsHFVnakEsHUU= github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= diff --git a/hack/main.go.tmpl b/hack/main.go.tmpl index c351f72c6b..ae0657c29e 100644 --- a/hack/main.go.tmpl +++ b/hack/main.go.tmpl @@ -222,7 +222,7 @@ func main() { })), "cannot create default store config") } - kingpin.FatalIfError(conversion.RegisterConversions(o.Provider), "Cannot initialize the webhook conversion registry") + kingpin.FatalIfError(conversion.RegisterConversions(o.Provider, mgr.GetScheme()), "Cannot initialize the webhook conversion registry") kingpin.FatalIfError(controller.Setup_{{ .Group }}(mgr, o), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") }