From 1900b265d83f8bd636be5f5ff3e4f48b82c9260e Mon Sep 17 00:00:00 2001 From: Alper Rifat Ulucinar Date: Thu, 10 Nov 2022 20:35:13 +0300 Subject: [PATCH 1/2] Make not-generated Terraform resources CSV available as a Github workflow artifact Signed-off-by: Alper Rifat Ulucinar --- .github/workflows/ci.yml | 14 +++++++++++++- cmd/generator/main.go | 9 ++++++++- go.mod | 2 ++ go.sum | 4 ++-- .../appengine/application/zz_controller.go | 1 + .../cloudfunctions/function/zz_controller.go | 1 + .../functioniammember/zz_controller.go | 1 + .../cloudplatform/folder/zz_controller.go | 1 + .../organizationiamauditconfig/zz_controller.go | 1 + .../organizationiamcustomrole/zz_controller.go | 1 + .../organizationiammember/zz_controller.go | 1 + .../cloudplatform/project/zz_controller.go | 1 + .../projectdefaultserviceaccounts/zz_controller.go | 1 + .../projectiamauditconfig/zz_controller.go | 1 + .../projectiammember/zz_controller.go | 1 + .../cloudplatform/projectservice/zz_controller.go | 1 + .../projectusageexportbucket/zz_controller.go | 1 + .../cloudplatform/serviceaccount/zz_controller.go | 1 + .../serviceaccountiammember/zz_controller.go | 1 + .../serviceaccountkey/zz_controller.go | 1 + .../zz_controller.go | 1 + .../cloudrun/domainmapping/zz_controller.go | 1 + .../controller/cloudrun/service/zz_controller.go | 1 + .../cloudrun/serviceiammember/zz_controller.go | 1 + .../controller/cloudscheduler/job/zz_controller.go | 1 + .../controller/cloudtasks/queue/zz_controller.go | 1 + .../composer/environment/zz_controller.go | 1 + .../controller/compute/address/zz_controller.go | 1 + .../compute/attacheddisk/zz_controller.go | 1 + .../controller/compute/autoscaler/zz_controller.go | 1 + .../compute/backendbucket/zz_controller.go | 1 + .../backendbucketsignedurlkey/zz_controller.go | 1 + .../compute/backendservice/zz_controller.go | 1 + internal/controller/compute/disk/zz_controller.go | 1 + .../compute/diskiammember/zz_controller.go | 1 + .../diskresourcepolicyattachment/zz_controller.go | 1 + .../compute/externalvpngateway/zz_controller.go | 1 + .../controller/compute/firewall/zz_controller.go | 1 + .../compute/firewallpolicy/zz_controller.go | 1 + .../firewallpolicyassociation/zz_controller.go | 1 + .../compute/firewallpolicyrule/zz_controller.go | 1 + .../compute/forwardingrule/zz_controller.go | 1 + .../compute/globaladdress/zz_controller.go | 1 + .../compute/globalforwardingrule/zz_controller.go | 1 + .../compute/globalnetworkendpoint/zz_controller.go | 1 + .../globalnetworkendpointgroup/zz_controller.go | 1 + .../compute/havpngateway/zz_controller.go | 1 + .../compute/healthcheck/zz_controller.go | 1 + .../compute/httphealthcheck/zz_controller.go | 1 + .../compute/httpshealthcheck/zz_controller.go | 1 + internal/controller/compute/image/zz_controller.go | 1 + .../compute/imageiammember/zz_controller.go | 1 + .../controller/compute/instance/zz_controller.go | 1 + .../compute/instancefromtemplate/zz_controller.go | 1 + .../compute/instancegroup/zz_controller.go | 1 + .../compute/instancegroupmanager/zz_controller.go | 1 + .../instancegroupnamedport/zz_controller.go | 1 + .../compute/instanceiammember/zz_controller.go | 1 + .../compute/instancetemplate/zz_controller.go | 1 + .../interconnectattachment/zz_controller.go | 1 + .../compute/managedsslcertificate/zz_controller.go | 1 + .../controller/compute/network/zz_controller.go | 1 + .../compute/networkendpoint/zz_controller.go | 1 + .../compute/networkendpointgroup/zz_controller.go | 1 + .../compute/networkpeering/zz_controller.go | 1 + .../networkpeeringroutesconfig/zz_controller.go | 1 + .../controller/compute/nodegroup/zz_controller.go | 1 + .../compute/nodetemplate/zz_controller.go | 1 + .../compute/packetmirroring/zz_controller.go | 1 + .../compute/perinstanceconfig/zz_controller.go | 1 + .../projectdefaultnetworktier/zz_controller.go | 1 + .../compute/projectmetadata/zz_controller.go | 1 + .../compute/projectmetadataitem/zz_controller.go | 1 + .../compute/regionautoscaler/zz_controller.go | 1 + .../compute/regionbackendservice/zz_controller.go | 1 + .../controller/compute/regiondisk/zz_controller.go | 1 + .../compute/regiondiskiammember/zz_controller.go | 1 + .../zz_controller.go | 1 + .../compute/regionhealthcheck/zz_controller.go | 1 + .../regioninstancegroupmanager/zz_controller.go | 1 + .../regionnetworkendpointgroup/zz_controller.go | 1 + .../regionperinstanceconfig/zz_controller.go | 1 + .../compute/regionsslcertificate/zz_controller.go | 1 + .../compute/regiontargethttpproxy/zz_controller.go | 1 + .../regiontargethttpsproxy/zz_controller.go | 1 + .../compute/regionurlmap/zz_controller.go | 1 + .../compute/reservation/zz_controller.go | 1 + .../compute/resourcepolicy/zz_controller.go | 1 + internal/controller/compute/route/zz_controller.go | 1 + .../controller/compute/router/zz_controller.go | 1 + .../compute/routerinterface/zz_controller.go | 1 + .../controller/compute/routernat/zz_controller.go | 1 + .../compute/securitypolicy/zz_controller.go | 1 + .../compute/serviceattachment/zz_controller.go | 1 + .../compute/sslcertificate/zz_controller.go | 1 + .../controller/compute/subnetwork/zz_controller.go | 1 + .../compute/subnetworkiammember/zz_controller.go | 1 + .../compute/targetgrpcproxy/zz_controller.go | 1 + .../compute/targethttpproxy/zz_controller.go | 1 + .../compute/targethttpsproxy/zz_controller.go | 1 + .../compute/targetinstance/zz_controller.go | 1 + .../controller/compute/targetpool/zz_controller.go | 1 + .../compute/targetsslproxy/zz_controller.go | 1 + .../compute/targettcpproxy/zz_controller.go | 1 + .../controller/compute/urlmap/zz_controller.go | 1 + .../controller/compute/vpngateway/zz_controller.go | 1 + .../controller/compute/vpntunnel/zz_controller.go | 1 + .../controller/container/cluster/zz_controller.go | 1 + .../controller/container/nodepool/zz_controller.go | 1 + .../controller/container/registry/zz_controller.go | 1 + .../containeranalysis/note/zz_controller.go | 1 + .../containeraws/cluster/zz_controller.go | 1 + .../containeraws/nodepool/zz_controller.go | 1 + .../containerazure/client/zz_controller.go | 1 + .../containerazure/cluster/zz_controller.go | 1 + .../containerazure/nodepool/zz_controller.go | 1 + .../controller/datacatalog/entry/zz_controller.go | 1 + .../datacatalog/entrygroup/zz_controller.go | 1 + .../controller/dialogflowcx/agent/zz_controller.go | 1 + .../dialogflowcx/entitytype/zz_controller.go | 1 + .../dialogflowcx/environment/zz_controller.go | 1 + .../controller/dialogflowcx/flow/zz_controller.go | 1 + .../dialogflowcx/intent/zz_controller.go | 1 + .../controller/dialogflowcx/page/zz_controller.go | 1 + .../dialogflowcx/version/zz_controller.go | 1 + .../controller/dns/managedzone/zz_controller.go | 1 + internal/controller/dns/policy/zz_controller.go | 1 + internal/controller/dns/recordset/zz_controller.go | 1 + .../essentialcontacts/contact/zz_controller.go | 1 + .../controller/eventarc/trigger/zz_controller.go | 1 + .../controller/filestore/instance/zz_controller.go | 1 + .../firebaserules/release/zz_controller.go | 1 + .../firebaserules/ruleset/zz_controller.go | 1 + .../controller/gkehub/membership/zz_controller.go | 1 + .../healthcare/consentstore/zz_controller.go | 1 + .../controller/healthcare/dataset/zz_controller.go | 1 + .../webbackendserviceiammember/zz_controller.go | 1 + .../controller/iap/webiammember/zz_controller.go | 1 + .../iap/webtypeappengineiammember/zz_controller.go | 1 + .../iap/webtypecomputeiammember/zz_controller.go | 1 + .../defaultsupportedidpconfig/zz_controller.go | 1 + .../inboundsamlconfig/zz_controller.go | 1 + .../oauthidpconfig/zz_controller.go | 1 + .../identityplatform/tenant/zz_controller.go | 1 + .../zz_controller.go | 1 + .../tenantinboundsamlconfig/zz_controller.go | 1 + .../tenantoauthidpconfig/zz_controller.go | 1 + internal/controller/kms/cryptokey/zz_controller.go | 1 + .../kms/cryptokeyiammember/zz_controller.go | 1 + internal/controller/kms/keyring/zz_controller.go | 1 + .../kms/keyringiammember/zz_controller.go | 1 + .../kms/keyringimportjob/zz_controller.go | 1 + .../kms/secretciphertext/zz_controller.go | 1 + .../monitoring/alertpolicy/zz_controller.go | 1 + .../notificationchannel/zz_controller.go | 1 + .../monitoring/uptimecheckconfig/zz_controller.go | 1 + .../notebooks/environment/zz_controller.go | 1 + .../controller/notebooks/instance/zz_controller.go | 1 + .../notebooks/instanceiammember/zz_controller.go | 1 + .../controller/notebooks/runtime/zz_controller.go | 1 + .../notebooks/runtimeiammember/zz_controller.go | 1 + .../osconfig/ospolicyassignment/zz_controller.go | 1 + .../osconfig/patchdeployment/zz_controller.go | 1 + .../oslogin/sshpublickey/zz_controller.go | 1 + .../controller/privateca/capool/zz_controller.go | 1 + .../privateca/capooliammember/zz_controller.go | 1 + .../privateca/certificate/zz_controller.go | 1 + .../certificateauthority/zz_controller.go | 1 + .../privateca/certificatetemplate/zz_controller.go | 1 + .../certificatetemplateiammember/zz_controller.go | 1 + .../pubsub/litereservation/zz_controller.go | 1 + .../pubsub/litesubscription/zz_controller.go | 1 + .../controller/pubsub/litetopic/zz_controller.go | 1 + internal/controller/pubsub/schema/zz_controller.go | 1 + .../pubsub/subscription/zz_controller.go | 1 + .../pubsub/subscriptioniammember/zz_controller.go | 1 + internal/controller/pubsub/topic/zz_controller.go | 1 + .../pubsub/topiciammember/zz_controller.go | 1 + .../controller/redis/instance/zz_controller.go | 1 + .../secretmanager/secret/zz_controller.go | 1 + .../secretmanager/secretiammember/zz_controller.go | 1 + .../secretmanager/secretversion/zz_controller.go | 1 + .../servicenetworking/connection/zz_controller.go | 1 + .../sourcerepo/repository/zz_controller.go | 1 + .../repositoryiammember/zz_controller.go | 1 + .../controller/spanner/database/zz_controller.go | 1 + .../spanner/databaseiammember/zz_controller.go | 1 + .../controller/spanner/instance/zz_controller.go | 1 + .../spanner/instanceiammember/zz_controller.go | 1 + internal/controller/sql/database/zz_controller.go | 1 + .../sql/databaseinstance/zz_controller.go | 1 + .../sourcerepresentationinstance/zz_controller.go | 1 + internal/controller/sql/sslcert/zz_controller.go | 1 + internal/controller/sql/user/zz_controller.go | 1 + .../controller/storage/bucket/zz_controller.go | 1 + .../storage/bucketaccesscontrol/zz_controller.go | 1 + .../controller/storage/bucketacl/zz_controller.go | 1 + .../storage/bucketiammember/zz_controller.go | 1 + .../storage/bucketobject/zz_controller.go | 1 + .../defaultobjectaccesscontrol/zz_controller.go | 1 + .../storage/defaultobjectacl/zz_controller.go | 1 + 201 files changed, 222 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 71bc9d53d..e51259647 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -118,7 +118,19 @@ jobs: run: make vendor vendor.check - name: Check Diff - run: make check-diff + run: | + mkdir _output + make check-diff + env: + # check-diff depends on the generate Make target, and we would like + # to save a skipped resource list + SKIPPED_RESOURCES_CSV: ../_output/skipped_resources.csv + + - name: Publish skipped resources CSV to Github + uses: actions/upload-artifact@v3 + with: + name: skipped_resources + path: _output/skipped_resources.csv unit-tests: runs-on: ubuntu-22.04 diff --git a/cmd/generator/main.go b/cmd/generator/main.go index 26a2eef14..69fab28ca 100644 --- a/cmd/generator/main.go +++ b/cmd/generator/main.go @@ -4,6 +4,7 @@ import ( "fmt" "os" "path/filepath" + "strings" "github.com/upbound/upjet/pkg/pipeline" @@ -18,5 +19,11 @@ func main() { if err != nil { panic(fmt.Sprintf("cannot calculate the absolute path of %s", os.Args[1])) } - pipeline.Run(config.GetProvider(), absRootDir) + p := config.GetProvider() + pipeline.Run(p, absRootDir) + if fp := os.Getenv("SKIPPED_RESOURCES_CSV"); len(fp) != 0 { + if err := os.WriteFile(fp, []byte(strings.Join(p.GetSkippedResourceNames(), ",")), 0o600); err != nil { + panic(fmt.Sprintf("cannot write skipped resources CSV to file %s: %s", fp, err.Error())) + } + } } diff --git a/go.mod b/go.mod index 61d69933b..e32a7b834 100644 --- a/go.mod +++ b/go.mod @@ -142,3 +142,5 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect sigs.k8s.io/yaml v1.3.0 // indirect ) + +replace github.com/upbound/upjet => github.com/ulucinar/upbound-upjet v0.0.0-20221110144831-17aa3b94b882 diff --git a/go.sum b/go.sum index 5e61fae11..ce604a9f0 100644 --- a/go.sum +++ b/go.sum @@ -648,8 +648,8 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1 github.com/tmccombs/hcl2json v0.3.3 h1:+DLNYqpWE0CsOQiEZu+OZm5ZBImake3wtITYxQ8uLFQ= github.com/tmccombs/hcl2json v0.3.3/go.mod h1:Y2chtz2x9bAeRTvSibVRVgbLJhLJXKlUeIvjeVdnm4w= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= -github.com/upbound/upjet v0.7.0 h1:DxfijsUHk5qhdpQemyQe0NYL89vbXgfoH85c5ma8rUA= -github.com/upbound/upjet v0.7.0/go.mod h1:QyDjh8h49niORvHLHZE8ZS4fiCa6Dkcsw3aBJBfK3I8= +github.com/ulucinar/upbound-upjet v0.0.0-20221110144831-17aa3b94b882 h1:X8sBFqLPia9Wd5HB6CzdoGpwtZNd9wH2hv8x4nuCYCk= +github.com/ulucinar/upbound-upjet v0.0.0-20221110144831-17aa3b94b882/go.mod h1:QyDjh8h49niORvHLHZE8ZS4fiCa6Dkcsw3aBJBfK3I8= github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI= github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= diff --git a/internal/controller/appengine/application/zz_controller.go b/internal/controller/appengine/application/zz_controller.go index 37b3007c0..7f5fd6668 100755 --- a/internal/controller/appengine/application/zz_controller.go +++ b/internal/controller/appengine/application/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/cloudfunctions/function/zz_controller.go b/internal/controller/cloudfunctions/function/zz_controller.go index db3e5a008..9e0d7ae2b 100755 --- a/internal/controller/cloudfunctions/function/zz_controller.go +++ b/internal/controller/cloudfunctions/function/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/cloudfunctions/functioniammember/zz_controller.go b/internal/controller/cloudfunctions/functioniammember/zz_controller.go index f6197b364..578a75df4 100755 --- a/internal/controller/cloudfunctions/functioniammember/zz_controller.go +++ b/internal/controller/cloudfunctions/functioniammember/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/cloudplatform/folder/zz_controller.go b/internal/controller/cloudplatform/folder/zz_controller.go index 2aa0e2916..550a30c00 100755 --- a/internal/controller/cloudplatform/folder/zz_controller.go +++ b/internal/controller/cloudplatform/folder/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/cloudplatform/organizationiamauditconfig/zz_controller.go b/internal/controller/cloudplatform/organizationiamauditconfig/zz_controller.go index 212c1f207..79a17eab5 100755 --- a/internal/controller/cloudplatform/organizationiamauditconfig/zz_controller.go +++ b/internal/controller/cloudplatform/organizationiamauditconfig/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/cloudplatform/organizationiamcustomrole/zz_controller.go b/internal/controller/cloudplatform/organizationiamcustomrole/zz_controller.go index be39ddfec..59e14ab65 100755 --- a/internal/controller/cloudplatform/organizationiamcustomrole/zz_controller.go +++ b/internal/controller/cloudplatform/organizationiamcustomrole/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/cloudplatform/organizationiammember/zz_controller.go b/internal/controller/cloudplatform/organizationiammember/zz_controller.go index a3730eb28..15585f922 100755 --- a/internal/controller/cloudplatform/organizationiammember/zz_controller.go +++ b/internal/controller/cloudplatform/organizationiammember/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/cloudplatform/project/zz_controller.go b/internal/controller/cloudplatform/project/zz_controller.go index 350e9d507..14aec9ece 100755 --- a/internal/controller/cloudplatform/project/zz_controller.go +++ b/internal/controller/cloudplatform/project/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/cloudplatform/projectdefaultserviceaccounts/zz_controller.go b/internal/controller/cloudplatform/projectdefaultserviceaccounts/zz_controller.go index 7eda24185..70a7d05e6 100755 --- a/internal/controller/cloudplatform/projectdefaultserviceaccounts/zz_controller.go +++ b/internal/controller/cloudplatform/projectdefaultserviceaccounts/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/cloudplatform/projectiamauditconfig/zz_controller.go b/internal/controller/cloudplatform/projectiamauditconfig/zz_controller.go index 44115bf9b..278f21102 100755 --- a/internal/controller/cloudplatform/projectiamauditconfig/zz_controller.go +++ b/internal/controller/cloudplatform/projectiamauditconfig/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/cloudplatform/projectiammember/zz_controller.go b/internal/controller/cloudplatform/projectiammember/zz_controller.go index a2e045389..823e59322 100755 --- a/internal/controller/cloudplatform/projectiammember/zz_controller.go +++ b/internal/controller/cloudplatform/projectiammember/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/cloudplatform/projectservice/zz_controller.go b/internal/controller/cloudplatform/projectservice/zz_controller.go index 4d0d39eb7..d83b7cd25 100755 --- a/internal/controller/cloudplatform/projectservice/zz_controller.go +++ b/internal/controller/cloudplatform/projectservice/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/cloudplatform/projectusageexportbucket/zz_controller.go b/internal/controller/cloudplatform/projectusageexportbucket/zz_controller.go index f337fa323..f6bb9c429 100755 --- a/internal/controller/cloudplatform/projectusageexportbucket/zz_controller.go +++ b/internal/controller/cloudplatform/projectusageexportbucket/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/cloudplatform/serviceaccount/zz_controller.go b/internal/controller/cloudplatform/serviceaccount/zz_controller.go index 0dfc98053..a29de2144 100755 --- a/internal/controller/cloudplatform/serviceaccount/zz_controller.go +++ b/internal/controller/cloudplatform/serviceaccount/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/cloudplatform/serviceaccountiammember/zz_controller.go b/internal/controller/cloudplatform/serviceaccountiammember/zz_controller.go index 5836b69c7..66c10db80 100755 --- a/internal/controller/cloudplatform/serviceaccountiammember/zz_controller.go +++ b/internal/controller/cloudplatform/serviceaccountiammember/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/cloudplatform/serviceaccountkey/zz_controller.go b/internal/controller/cloudplatform/serviceaccountkey/zz_controller.go index 2b536bcfa..51c11ee95 100755 --- a/internal/controller/cloudplatform/serviceaccountkey/zz_controller.go +++ b/internal/controller/cloudplatform/serviceaccountkey/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/cloudplatform/servicenetworkingpeereddnsdomain/zz_controller.go b/internal/controller/cloudplatform/servicenetworkingpeereddnsdomain/zz_controller.go index a606b1d33..90ec377c2 100755 --- a/internal/controller/cloudplatform/servicenetworkingpeereddnsdomain/zz_controller.go +++ b/internal/controller/cloudplatform/servicenetworkingpeereddnsdomain/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/cloudrun/domainmapping/zz_controller.go b/internal/controller/cloudrun/domainmapping/zz_controller.go index dbf88b0d7..a9eb3e7a6 100755 --- a/internal/controller/cloudrun/domainmapping/zz_controller.go +++ b/internal/controller/cloudrun/domainmapping/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/cloudrun/service/zz_controller.go b/internal/controller/cloudrun/service/zz_controller.go index 9dd6388a0..40a32f04a 100755 --- a/internal/controller/cloudrun/service/zz_controller.go +++ b/internal/controller/cloudrun/service/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/cloudrun/serviceiammember/zz_controller.go b/internal/controller/cloudrun/serviceiammember/zz_controller.go index f93d0fbaf..ee59bd417 100755 --- a/internal/controller/cloudrun/serviceiammember/zz_controller.go +++ b/internal/controller/cloudrun/serviceiammember/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/cloudscheduler/job/zz_controller.go b/internal/controller/cloudscheduler/job/zz_controller.go index 286c602eb..d7acca4e8 100755 --- a/internal/controller/cloudscheduler/job/zz_controller.go +++ b/internal/controller/cloudscheduler/job/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/cloudtasks/queue/zz_controller.go b/internal/controller/cloudtasks/queue/zz_controller.go index fd07ebe51..e50d7a598 100755 --- a/internal/controller/cloudtasks/queue/zz_controller.go +++ b/internal/controller/cloudtasks/queue/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/composer/environment/zz_controller.go b/internal/controller/composer/environment/zz_controller.go index a2b98ffe0..b97e81792 100755 --- a/internal/controller/composer/environment/zz_controller.go +++ b/internal/controller/composer/environment/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/address/zz_controller.go b/internal/controller/compute/address/zz_controller.go index fe38f833f..1b848173e 100755 --- a/internal/controller/compute/address/zz_controller.go +++ b/internal/controller/compute/address/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/attacheddisk/zz_controller.go b/internal/controller/compute/attacheddisk/zz_controller.go index fa912610a..ce1addf34 100755 --- a/internal/controller/compute/attacheddisk/zz_controller.go +++ b/internal/controller/compute/attacheddisk/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/autoscaler/zz_controller.go b/internal/controller/compute/autoscaler/zz_controller.go index b9b99105a..9fb9b2e28 100755 --- a/internal/controller/compute/autoscaler/zz_controller.go +++ b/internal/controller/compute/autoscaler/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/backendbucket/zz_controller.go b/internal/controller/compute/backendbucket/zz_controller.go index 7c815714c..f4df81571 100755 --- a/internal/controller/compute/backendbucket/zz_controller.go +++ b/internal/controller/compute/backendbucket/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/backendbucketsignedurlkey/zz_controller.go b/internal/controller/compute/backendbucketsignedurlkey/zz_controller.go index a93411900..ae9a51e50 100755 --- a/internal/controller/compute/backendbucketsignedurlkey/zz_controller.go +++ b/internal/controller/compute/backendbucketsignedurlkey/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/backendservice/zz_controller.go b/internal/controller/compute/backendservice/zz_controller.go index 5e51b43c4..b0dc025da 100755 --- a/internal/controller/compute/backendservice/zz_controller.go +++ b/internal/controller/compute/backendservice/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/disk/zz_controller.go b/internal/controller/compute/disk/zz_controller.go index 2eadf4c2e..b21f62806 100755 --- a/internal/controller/compute/disk/zz_controller.go +++ b/internal/controller/compute/disk/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/diskiammember/zz_controller.go b/internal/controller/compute/diskiammember/zz_controller.go index d38a2eb0e..c39287cf2 100755 --- a/internal/controller/compute/diskiammember/zz_controller.go +++ b/internal/controller/compute/diskiammember/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/diskresourcepolicyattachment/zz_controller.go b/internal/controller/compute/diskresourcepolicyattachment/zz_controller.go index 6bff895bf..8d86e318c 100755 --- a/internal/controller/compute/diskresourcepolicyattachment/zz_controller.go +++ b/internal/controller/compute/diskresourcepolicyattachment/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/externalvpngateway/zz_controller.go b/internal/controller/compute/externalvpngateway/zz_controller.go index e8a5b4c00..65d227680 100755 --- a/internal/controller/compute/externalvpngateway/zz_controller.go +++ b/internal/controller/compute/externalvpngateway/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/firewall/zz_controller.go b/internal/controller/compute/firewall/zz_controller.go index 9ccba3944..886b0a813 100755 --- a/internal/controller/compute/firewall/zz_controller.go +++ b/internal/controller/compute/firewall/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/firewallpolicy/zz_controller.go b/internal/controller/compute/firewallpolicy/zz_controller.go index 4ad045772..967ac8adb 100755 --- a/internal/controller/compute/firewallpolicy/zz_controller.go +++ b/internal/controller/compute/firewallpolicy/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/firewallpolicyassociation/zz_controller.go b/internal/controller/compute/firewallpolicyassociation/zz_controller.go index 47ae51811..0b30346fb 100755 --- a/internal/controller/compute/firewallpolicyassociation/zz_controller.go +++ b/internal/controller/compute/firewallpolicyassociation/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/firewallpolicyrule/zz_controller.go b/internal/controller/compute/firewallpolicyrule/zz_controller.go index bfb588cbb..a6be3e483 100755 --- a/internal/controller/compute/firewallpolicyrule/zz_controller.go +++ b/internal/controller/compute/firewallpolicyrule/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/forwardingrule/zz_controller.go b/internal/controller/compute/forwardingrule/zz_controller.go index 38d12836f..38f0fe4e8 100755 --- a/internal/controller/compute/forwardingrule/zz_controller.go +++ b/internal/controller/compute/forwardingrule/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/globaladdress/zz_controller.go b/internal/controller/compute/globaladdress/zz_controller.go index 0e9dbe320..5b7dcdc7a 100755 --- a/internal/controller/compute/globaladdress/zz_controller.go +++ b/internal/controller/compute/globaladdress/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/globalforwardingrule/zz_controller.go b/internal/controller/compute/globalforwardingrule/zz_controller.go index a290ff51d..46eb00b86 100755 --- a/internal/controller/compute/globalforwardingrule/zz_controller.go +++ b/internal/controller/compute/globalforwardingrule/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/globalnetworkendpoint/zz_controller.go b/internal/controller/compute/globalnetworkendpoint/zz_controller.go index e1b401fa9..a0a1b2757 100755 --- a/internal/controller/compute/globalnetworkendpoint/zz_controller.go +++ b/internal/controller/compute/globalnetworkendpoint/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/globalnetworkendpointgroup/zz_controller.go b/internal/controller/compute/globalnetworkendpointgroup/zz_controller.go index 945879939..e5d0e5076 100755 --- a/internal/controller/compute/globalnetworkendpointgroup/zz_controller.go +++ b/internal/controller/compute/globalnetworkendpointgroup/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/havpngateway/zz_controller.go b/internal/controller/compute/havpngateway/zz_controller.go index cd3a351f3..510c5d019 100755 --- a/internal/controller/compute/havpngateway/zz_controller.go +++ b/internal/controller/compute/havpngateway/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/healthcheck/zz_controller.go b/internal/controller/compute/healthcheck/zz_controller.go index b7d04e713..3140e628c 100755 --- a/internal/controller/compute/healthcheck/zz_controller.go +++ b/internal/controller/compute/healthcheck/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/httphealthcheck/zz_controller.go b/internal/controller/compute/httphealthcheck/zz_controller.go index 4b549ba30..97158c784 100755 --- a/internal/controller/compute/httphealthcheck/zz_controller.go +++ b/internal/controller/compute/httphealthcheck/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/httpshealthcheck/zz_controller.go b/internal/controller/compute/httpshealthcheck/zz_controller.go index 0ff0a3363..0caacfc18 100755 --- a/internal/controller/compute/httpshealthcheck/zz_controller.go +++ b/internal/controller/compute/httpshealthcheck/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/image/zz_controller.go b/internal/controller/compute/image/zz_controller.go index bcc70b630..f042743f2 100755 --- a/internal/controller/compute/image/zz_controller.go +++ b/internal/controller/compute/image/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/imageiammember/zz_controller.go b/internal/controller/compute/imageiammember/zz_controller.go index 79e78c20c..f84435335 100755 --- a/internal/controller/compute/imageiammember/zz_controller.go +++ b/internal/controller/compute/imageiammember/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/instance/zz_controller.go b/internal/controller/compute/instance/zz_controller.go index eef9ccb25..0c7de4b86 100755 --- a/internal/controller/compute/instance/zz_controller.go +++ b/internal/controller/compute/instance/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/instancefromtemplate/zz_controller.go b/internal/controller/compute/instancefromtemplate/zz_controller.go index a6c0c5ec0..6ee639a2f 100755 --- a/internal/controller/compute/instancefromtemplate/zz_controller.go +++ b/internal/controller/compute/instancefromtemplate/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/instancegroup/zz_controller.go b/internal/controller/compute/instancegroup/zz_controller.go index 81d5f5f5f..ffe4725af 100755 --- a/internal/controller/compute/instancegroup/zz_controller.go +++ b/internal/controller/compute/instancegroup/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/instancegroupmanager/zz_controller.go b/internal/controller/compute/instancegroupmanager/zz_controller.go index 4efe997ee..bf8574f55 100755 --- a/internal/controller/compute/instancegroupmanager/zz_controller.go +++ b/internal/controller/compute/instancegroupmanager/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/instancegroupnamedport/zz_controller.go b/internal/controller/compute/instancegroupnamedport/zz_controller.go index dabf9d304..0d5817448 100755 --- a/internal/controller/compute/instancegroupnamedport/zz_controller.go +++ b/internal/controller/compute/instancegroupnamedport/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/instanceiammember/zz_controller.go b/internal/controller/compute/instanceiammember/zz_controller.go index 6732eaee5..676307ad9 100755 --- a/internal/controller/compute/instanceiammember/zz_controller.go +++ b/internal/controller/compute/instanceiammember/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/instancetemplate/zz_controller.go b/internal/controller/compute/instancetemplate/zz_controller.go index 2e7fb6b04..40cc78bd4 100755 --- a/internal/controller/compute/instancetemplate/zz_controller.go +++ b/internal/controller/compute/instancetemplate/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/interconnectattachment/zz_controller.go b/internal/controller/compute/interconnectattachment/zz_controller.go index e9177a68a..9b0991fd8 100755 --- a/internal/controller/compute/interconnectattachment/zz_controller.go +++ b/internal/controller/compute/interconnectattachment/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/managedsslcertificate/zz_controller.go b/internal/controller/compute/managedsslcertificate/zz_controller.go index f78b96a3f..6d6410a44 100755 --- a/internal/controller/compute/managedsslcertificate/zz_controller.go +++ b/internal/controller/compute/managedsslcertificate/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/network/zz_controller.go b/internal/controller/compute/network/zz_controller.go index 482114db9..ae31d6eec 100755 --- a/internal/controller/compute/network/zz_controller.go +++ b/internal/controller/compute/network/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/networkendpoint/zz_controller.go b/internal/controller/compute/networkendpoint/zz_controller.go index e19ae86aa..cf425d2d8 100755 --- a/internal/controller/compute/networkendpoint/zz_controller.go +++ b/internal/controller/compute/networkendpoint/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/networkendpointgroup/zz_controller.go b/internal/controller/compute/networkendpointgroup/zz_controller.go index 652918e57..29d32c764 100755 --- a/internal/controller/compute/networkendpointgroup/zz_controller.go +++ b/internal/controller/compute/networkendpointgroup/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/networkpeering/zz_controller.go b/internal/controller/compute/networkpeering/zz_controller.go index ae8f17472..60e1383bb 100755 --- a/internal/controller/compute/networkpeering/zz_controller.go +++ b/internal/controller/compute/networkpeering/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/networkpeeringroutesconfig/zz_controller.go b/internal/controller/compute/networkpeeringroutesconfig/zz_controller.go index 3e9d55452..d5f5291f0 100755 --- a/internal/controller/compute/networkpeeringroutesconfig/zz_controller.go +++ b/internal/controller/compute/networkpeeringroutesconfig/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/nodegroup/zz_controller.go b/internal/controller/compute/nodegroup/zz_controller.go index f512c29b8..375bc3f51 100755 --- a/internal/controller/compute/nodegroup/zz_controller.go +++ b/internal/controller/compute/nodegroup/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/nodetemplate/zz_controller.go b/internal/controller/compute/nodetemplate/zz_controller.go index c5bfa84bd..3f3d0807c 100755 --- a/internal/controller/compute/nodetemplate/zz_controller.go +++ b/internal/controller/compute/nodetemplate/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/packetmirroring/zz_controller.go b/internal/controller/compute/packetmirroring/zz_controller.go index abc2f294b..14e0623a5 100755 --- a/internal/controller/compute/packetmirroring/zz_controller.go +++ b/internal/controller/compute/packetmirroring/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/perinstanceconfig/zz_controller.go b/internal/controller/compute/perinstanceconfig/zz_controller.go index dbd4c7142..e981759fd 100755 --- a/internal/controller/compute/perinstanceconfig/zz_controller.go +++ b/internal/controller/compute/perinstanceconfig/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/projectdefaultnetworktier/zz_controller.go b/internal/controller/compute/projectdefaultnetworktier/zz_controller.go index 262c19e69..5404653e7 100755 --- a/internal/controller/compute/projectdefaultnetworktier/zz_controller.go +++ b/internal/controller/compute/projectdefaultnetworktier/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/projectmetadata/zz_controller.go b/internal/controller/compute/projectmetadata/zz_controller.go index f72a1fb78..5bcbb93b3 100755 --- a/internal/controller/compute/projectmetadata/zz_controller.go +++ b/internal/controller/compute/projectmetadata/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/projectmetadataitem/zz_controller.go b/internal/controller/compute/projectmetadataitem/zz_controller.go index 987de2bb0..12d9fd746 100755 --- a/internal/controller/compute/projectmetadataitem/zz_controller.go +++ b/internal/controller/compute/projectmetadataitem/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/regionautoscaler/zz_controller.go b/internal/controller/compute/regionautoscaler/zz_controller.go index b842241fc..07606cfcb 100755 --- a/internal/controller/compute/regionautoscaler/zz_controller.go +++ b/internal/controller/compute/regionautoscaler/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/regionbackendservice/zz_controller.go b/internal/controller/compute/regionbackendservice/zz_controller.go index a2c534be7..54e5bf2f9 100755 --- a/internal/controller/compute/regionbackendservice/zz_controller.go +++ b/internal/controller/compute/regionbackendservice/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/regiondisk/zz_controller.go b/internal/controller/compute/regiondisk/zz_controller.go index dbf2f65dc..7ca5e1bf3 100755 --- a/internal/controller/compute/regiondisk/zz_controller.go +++ b/internal/controller/compute/regiondisk/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/regiondiskiammember/zz_controller.go b/internal/controller/compute/regiondiskiammember/zz_controller.go index 962face3d..676d93b16 100755 --- a/internal/controller/compute/regiondiskiammember/zz_controller.go +++ b/internal/controller/compute/regiondiskiammember/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/regiondiskresourcepolicyattachment/zz_controller.go b/internal/controller/compute/regiondiskresourcepolicyattachment/zz_controller.go index c4295457d..fd1d2490f 100755 --- a/internal/controller/compute/regiondiskresourcepolicyattachment/zz_controller.go +++ b/internal/controller/compute/regiondiskresourcepolicyattachment/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/regionhealthcheck/zz_controller.go b/internal/controller/compute/regionhealthcheck/zz_controller.go index 2f992a2f9..11ff4612c 100755 --- a/internal/controller/compute/regionhealthcheck/zz_controller.go +++ b/internal/controller/compute/regionhealthcheck/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/regioninstancegroupmanager/zz_controller.go b/internal/controller/compute/regioninstancegroupmanager/zz_controller.go index 347956636..abd21c773 100755 --- a/internal/controller/compute/regioninstancegroupmanager/zz_controller.go +++ b/internal/controller/compute/regioninstancegroupmanager/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/regionnetworkendpointgroup/zz_controller.go b/internal/controller/compute/regionnetworkendpointgroup/zz_controller.go index 2d0c54edc..da4aba32d 100755 --- a/internal/controller/compute/regionnetworkendpointgroup/zz_controller.go +++ b/internal/controller/compute/regionnetworkendpointgroup/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/regionperinstanceconfig/zz_controller.go b/internal/controller/compute/regionperinstanceconfig/zz_controller.go index 85aceaae7..a0f58567a 100755 --- a/internal/controller/compute/regionperinstanceconfig/zz_controller.go +++ b/internal/controller/compute/regionperinstanceconfig/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/regionsslcertificate/zz_controller.go b/internal/controller/compute/regionsslcertificate/zz_controller.go index 2f210e4b6..a0a7fbe33 100755 --- a/internal/controller/compute/regionsslcertificate/zz_controller.go +++ b/internal/controller/compute/regionsslcertificate/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/regiontargethttpproxy/zz_controller.go b/internal/controller/compute/regiontargethttpproxy/zz_controller.go index 5bf27723f..732659258 100755 --- a/internal/controller/compute/regiontargethttpproxy/zz_controller.go +++ b/internal/controller/compute/regiontargethttpproxy/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/regiontargethttpsproxy/zz_controller.go b/internal/controller/compute/regiontargethttpsproxy/zz_controller.go index 5d64df5a4..2585d5864 100755 --- a/internal/controller/compute/regiontargethttpsproxy/zz_controller.go +++ b/internal/controller/compute/regiontargethttpsproxy/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/regionurlmap/zz_controller.go b/internal/controller/compute/regionurlmap/zz_controller.go index ad9dbc159..558fa7602 100755 --- a/internal/controller/compute/regionurlmap/zz_controller.go +++ b/internal/controller/compute/regionurlmap/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/reservation/zz_controller.go b/internal/controller/compute/reservation/zz_controller.go index b6dd98c5d..b4d80b4e7 100755 --- a/internal/controller/compute/reservation/zz_controller.go +++ b/internal/controller/compute/reservation/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/resourcepolicy/zz_controller.go b/internal/controller/compute/resourcepolicy/zz_controller.go index dd48113a6..7918f0a9d 100755 --- a/internal/controller/compute/resourcepolicy/zz_controller.go +++ b/internal/controller/compute/resourcepolicy/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/route/zz_controller.go b/internal/controller/compute/route/zz_controller.go index 2e904d19d..8e2360534 100755 --- a/internal/controller/compute/route/zz_controller.go +++ b/internal/controller/compute/route/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/router/zz_controller.go b/internal/controller/compute/router/zz_controller.go index bff071401..f79a4af9c 100755 --- a/internal/controller/compute/router/zz_controller.go +++ b/internal/controller/compute/router/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/routerinterface/zz_controller.go b/internal/controller/compute/routerinterface/zz_controller.go index 8e02e836b..742c64f23 100755 --- a/internal/controller/compute/routerinterface/zz_controller.go +++ b/internal/controller/compute/routerinterface/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/routernat/zz_controller.go b/internal/controller/compute/routernat/zz_controller.go index e331b8d4f..b32c6fb6c 100755 --- a/internal/controller/compute/routernat/zz_controller.go +++ b/internal/controller/compute/routernat/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/securitypolicy/zz_controller.go b/internal/controller/compute/securitypolicy/zz_controller.go index 9a4b31ef4..3c81e5c60 100755 --- a/internal/controller/compute/securitypolicy/zz_controller.go +++ b/internal/controller/compute/securitypolicy/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/serviceattachment/zz_controller.go b/internal/controller/compute/serviceattachment/zz_controller.go index 1abc5539e..3bd454ea0 100755 --- a/internal/controller/compute/serviceattachment/zz_controller.go +++ b/internal/controller/compute/serviceattachment/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/sslcertificate/zz_controller.go b/internal/controller/compute/sslcertificate/zz_controller.go index 81109c631..9b9f5e26a 100755 --- a/internal/controller/compute/sslcertificate/zz_controller.go +++ b/internal/controller/compute/sslcertificate/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/subnetwork/zz_controller.go b/internal/controller/compute/subnetwork/zz_controller.go index 8bf871782..c50085514 100755 --- a/internal/controller/compute/subnetwork/zz_controller.go +++ b/internal/controller/compute/subnetwork/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/subnetworkiammember/zz_controller.go b/internal/controller/compute/subnetworkiammember/zz_controller.go index 4b72cc248..55e6effde 100755 --- a/internal/controller/compute/subnetworkiammember/zz_controller.go +++ b/internal/controller/compute/subnetworkiammember/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/targetgrpcproxy/zz_controller.go b/internal/controller/compute/targetgrpcproxy/zz_controller.go index 517aed078..ec49add88 100755 --- a/internal/controller/compute/targetgrpcproxy/zz_controller.go +++ b/internal/controller/compute/targetgrpcproxy/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/targethttpproxy/zz_controller.go b/internal/controller/compute/targethttpproxy/zz_controller.go index dd17783c2..88375f652 100755 --- a/internal/controller/compute/targethttpproxy/zz_controller.go +++ b/internal/controller/compute/targethttpproxy/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/targethttpsproxy/zz_controller.go b/internal/controller/compute/targethttpsproxy/zz_controller.go index 91de23ebd..08081b5f9 100755 --- a/internal/controller/compute/targethttpsproxy/zz_controller.go +++ b/internal/controller/compute/targethttpsproxy/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/targetinstance/zz_controller.go b/internal/controller/compute/targetinstance/zz_controller.go index bfea0668e..3a8a509c7 100755 --- a/internal/controller/compute/targetinstance/zz_controller.go +++ b/internal/controller/compute/targetinstance/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/targetpool/zz_controller.go b/internal/controller/compute/targetpool/zz_controller.go index 737720509..c54f13ced 100755 --- a/internal/controller/compute/targetpool/zz_controller.go +++ b/internal/controller/compute/targetpool/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/targetsslproxy/zz_controller.go b/internal/controller/compute/targetsslproxy/zz_controller.go index 27347639d..2290848e3 100755 --- a/internal/controller/compute/targetsslproxy/zz_controller.go +++ b/internal/controller/compute/targetsslproxy/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/targettcpproxy/zz_controller.go b/internal/controller/compute/targettcpproxy/zz_controller.go index 990d25bd8..0e5405809 100755 --- a/internal/controller/compute/targettcpproxy/zz_controller.go +++ b/internal/controller/compute/targettcpproxy/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/urlmap/zz_controller.go b/internal/controller/compute/urlmap/zz_controller.go index bbc066786..af5045b19 100755 --- a/internal/controller/compute/urlmap/zz_controller.go +++ b/internal/controller/compute/urlmap/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/vpngateway/zz_controller.go b/internal/controller/compute/vpngateway/zz_controller.go index c5f55926d..02545b2a7 100755 --- a/internal/controller/compute/vpngateway/zz_controller.go +++ b/internal/controller/compute/vpngateway/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/compute/vpntunnel/zz_controller.go b/internal/controller/compute/vpntunnel/zz_controller.go index 393f95d2c..f6af570f3 100755 --- a/internal/controller/compute/vpntunnel/zz_controller.go +++ b/internal/controller/compute/vpntunnel/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/container/cluster/zz_controller.go b/internal/controller/container/cluster/zz_controller.go index 8c540f5b9..064e6e4cb 100755 --- a/internal/controller/container/cluster/zz_controller.go +++ b/internal/controller/container/cluster/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/container/nodepool/zz_controller.go b/internal/controller/container/nodepool/zz_controller.go index 3ffd8aeef..f9840d8df 100755 --- a/internal/controller/container/nodepool/zz_controller.go +++ b/internal/controller/container/nodepool/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/container/registry/zz_controller.go b/internal/controller/container/registry/zz_controller.go index 6b5d22e15..341f50279 100755 --- a/internal/controller/container/registry/zz_controller.go +++ b/internal/controller/container/registry/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/containeranalysis/note/zz_controller.go b/internal/controller/containeranalysis/note/zz_controller.go index c8247e456..cc8a0f24e 100755 --- a/internal/controller/containeranalysis/note/zz_controller.go +++ b/internal/controller/containeranalysis/note/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/containeraws/cluster/zz_controller.go b/internal/controller/containeraws/cluster/zz_controller.go index 449c654b7..341ba47e9 100755 --- a/internal/controller/containeraws/cluster/zz_controller.go +++ b/internal/controller/containeraws/cluster/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/containeraws/nodepool/zz_controller.go b/internal/controller/containeraws/nodepool/zz_controller.go index 642a5b052..0628b21a6 100755 --- a/internal/controller/containeraws/nodepool/zz_controller.go +++ b/internal/controller/containeraws/nodepool/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/containerazure/client/zz_controller.go b/internal/controller/containerazure/client/zz_controller.go index d838a0749..6cabbfd9e 100755 --- a/internal/controller/containerazure/client/zz_controller.go +++ b/internal/controller/containerazure/client/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/containerazure/cluster/zz_controller.go b/internal/controller/containerazure/cluster/zz_controller.go index 9914f4f38..2ed7cde67 100755 --- a/internal/controller/containerazure/cluster/zz_controller.go +++ b/internal/controller/containerazure/cluster/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/containerazure/nodepool/zz_controller.go b/internal/controller/containerazure/nodepool/zz_controller.go index 322dd1fa2..ef50a8dce 100755 --- a/internal/controller/containerazure/nodepool/zz_controller.go +++ b/internal/controller/containerazure/nodepool/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/datacatalog/entry/zz_controller.go b/internal/controller/datacatalog/entry/zz_controller.go index 1ecd317de..9c98798bf 100755 --- a/internal/controller/datacatalog/entry/zz_controller.go +++ b/internal/controller/datacatalog/entry/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/datacatalog/entrygroup/zz_controller.go b/internal/controller/datacatalog/entrygroup/zz_controller.go index dd5624468..bf39b32f2 100755 --- a/internal/controller/datacatalog/entrygroup/zz_controller.go +++ b/internal/controller/datacatalog/entrygroup/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/dialogflowcx/agent/zz_controller.go b/internal/controller/dialogflowcx/agent/zz_controller.go index ecdced87f..845174202 100755 --- a/internal/controller/dialogflowcx/agent/zz_controller.go +++ b/internal/controller/dialogflowcx/agent/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/dialogflowcx/entitytype/zz_controller.go b/internal/controller/dialogflowcx/entitytype/zz_controller.go index e6bfb04de..1229f71ea 100755 --- a/internal/controller/dialogflowcx/entitytype/zz_controller.go +++ b/internal/controller/dialogflowcx/entitytype/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/dialogflowcx/environment/zz_controller.go b/internal/controller/dialogflowcx/environment/zz_controller.go index f9d7c3b3c..544d05c66 100755 --- a/internal/controller/dialogflowcx/environment/zz_controller.go +++ b/internal/controller/dialogflowcx/environment/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/dialogflowcx/flow/zz_controller.go b/internal/controller/dialogflowcx/flow/zz_controller.go index cca98dd65..e0f1f4ff9 100755 --- a/internal/controller/dialogflowcx/flow/zz_controller.go +++ b/internal/controller/dialogflowcx/flow/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/dialogflowcx/intent/zz_controller.go b/internal/controller/dialogflowcx/intent/zz_controller.go index 26f86e0cc..25477bf35 100755 --- a/internal/controller/dialogflowcx/intent/zz_controller.go +++ b/internal/controller/dialogflowcx/intent/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/dialogflowcx/page/zz_controller.go b/internal/controller/dialogflowcx/page/zz_controller.go index 5d20a74f4..1613fe63a 100755 --- a/internal/controller/dialogflowcx/page/zz_controller.go +++ b/internal/controller/dialogflowcx/page/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/dialogflowcx/version/zz_controller.go b/internal/controller/dialogflowcx/version/zz_controller.go index f5d042484..92ae1bb25 100755 --- a/internal/controller/dialogflowcx/version/zz_controller.go +++ b/internal/controller/dialogflowcx/version/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/dns/managedzone/zz_controller.go b/internal/controller/dns/managedzone/zz_controller.go index 0fb7170e6..bb753f90d 100755 --- a/internal/controller/dns/managedzone/zz_controller.go +++ b/internal/controller/dns/managedzone/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/dns/policy/zz_controller.go b/internal/controller/dns/policy/zz_controller.go index 46cb16329..c3b122cd3 100755 --- a/internal/controller/dns/policy/zz_controller.go +++ b/internal/controller/dns/policy/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/dns/recordset/zz_controller.go b/internal/controller/dns/recordset/zz_controller.go index fba73c1bd..bcccad9e4 100755 --- a/internal/controller/dns/recordset/zz_controller.go +++ b/internal/controller/dns/recordset/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/essentialcontacts/contact/zz_controller.go b/internal/controller/essentialcontacts/contact/zz_controller.go index 319288035..e96ef823e 100755 --- a/internal/controller/essentialcontacts/contact/zz_controller.go +++ b/internal/controller/essentialcontacts/contact/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/eventarc/trigger/zz_controller.go b/internal/controller/eventarc/trigger/zz_controller.go index 3721c28c5..8e8c12a43 100755 --- a/internal/controller/eventarc/trigger/zz_controller.go +++ b/internal/controller/eventarc/trigger/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/filestore/instance/zz_controller.go b/internal/controller/filestore/instance/zz_controller.go index 05e73e2e2..c47bb822c 100755 --- a/internal/controller/filestore/instance/zz_controller.go +++ b/internal/controller/filestore/instance/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/firebaserules/release/zz_controller.go b/internal/controller/firebaserules/release/zz_controller.go index 5d6c6081f..1044c0795 100755 --- a/internal/controller/firebaserules/release/zz_controller.go +++ b/internal/controller/firebaserules/release/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/firebaserules/ruleset/zz_controller.go b/internal/controller/firebaserules/ruleset/zz_controller.go index ed9e0f7c9..f371fd129 100755 --- a/internal/controller/firebaserules/ruleset/zz_controller.go +++ b/internal/controller/firebaserules/ruleset/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/gkehub/membership/zz_controller.go b/internal/controller/gkehub/membership/zz_controller.go index 6a60ef5d7..9adbe7531 100755 --- a/internal/controller/gkehub/membership/zz_controller.go +++ b/internal/controller/gkehub/membership/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/healthcare/consentstore/zz_controller.go b/internal/controller/healthcare/consentstore/zz_controller.go index 19c81c6a0..56878bbe4 100755 --- a/internal/controller/healthcare/consentstore/zz_controller.go +++ b/internal/controller/healthcare/consentstore/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/healthcare/dataset/zz_controller.go b/internal/controller/healthcare/dataset/zz_controller.go index b144e9fe3..b80d4e7b2 100755 --- a/internal/controller/healthcare/dataset/zz_controller.go +++ b/internal/controller/healthcare/dataset/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/iap/webbackendserviceiammember/zz_controller.go b/internal/controller/iap/webbackendserviceiammember/zz_controller.go index c9bb2633e..f62410bf7 100755 --- a/internal/controller/iap/webbackendserviceiammember/zz_controller.go +++ b/internal/controller/iap/webbackendserviceiammember/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/iap/webiammember/zz_controller.go b/internal/controller/iap/webiammember/zz_controller.go index 0a7df2d7c..22b80b7cf 100755 --- a/internal/controller/iap/webiammember/zz_controller.go +++ b/internal/controller/iap/webiammember/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/iap/webtypeappengineiammember/zz_controller.go b/internal/controller/iap/webtypeappengineiammember/zz_controller.go index 550248ff7..b70a503f9 100755 --- a/internal/controller/iap/webtypeappengineiammember/zz_controller.go +++ b/internal/controller/iap/webtypeappengineiammember/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/iap/webtypecomputeiammember/zz_controller.go b/internal/controller/iap/webtypecomputeiammember/zz_controller.go index 9c3e9c446..aee197a62 100755 --- a/internal/controller/iap/webtypecomputeiammember/zz_controller.go +++ b/internal/controller/iap/webtypecomputeiammember/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/identityplatform/defaultsupportedidpconfig/zz_controller.go b/internal/controller/identityplatform/defaultsupportedidpconfig/zz_controller.go index 40d01cb4c..135c6ff49 100755 --- a/internal/controller/identityplatform/defaultsupportedidpconfig/zz_controller.go +++ b/internal/controller/identityplatform/defaultsupportedidpconfig/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/identityplatform/inboundsamlconfig/zz_controller.go b/internal/controller/identityplatform/inboundsamlconfig/zz_controller.go index 6e40aa921..4ab48f56a 100755 --- a/internal/controller/identityplatform/inboundsamlconfig/zz_controller.go +++ b/internal/controller/identityplatform/inboundsamlconfig/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/identityplatform/oauthidpconfig/zz_controller.go b/internal/controller/identityplatform/oauthidpconfig/zz_controller.go index 6c1231c14..3ceb7d7d9 100755 --- a/internal/controller/identityplatform/oauthidpconfig/zz_controller.go +++ b/internal/controller/identityplatform/oauthidpconfig/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/identityplatform/tenant/zz_controller.go b/internal/controller/identityplatform/tenant/zz_controller.go index 4dd3532d3..9cc3faa98 100755 --- a/internal/controller/identityplatform/tenant/zz_controller.go +++ b/internal/controller/identityplatform/tenant/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/identityplatform/tenantdefaultsupportedidpconfig/zz_controller.go b/internal/controller/identityplatform/tenantdefaultsupportedidpconfig/zz_controller.go index 413a60536..6a0274b86 100755 --- a/internal/controller/identityplatform/tenantdefaultsupportedidpconfig/zz_controller.go +++ b/internal/controller/identityplatform/tenantdefaultsupportedidpconfig/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/identityplatform/tenantinboundsamlconfig/zz_controller.go b/internal/controller/identityplatform/tenantinboundsamlconfig/zz_controller.go index 6c6059638..4b85e3111 100755 --- a/internal/controller/identityplatform/tenantinboundsamlconfig/zz_controller.go +++ b/internal/controller/identityplatform/tenantinboundsamlconfig/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/identityplatform/tenantoauthidpconfig/zz_controller.go b/internal/controller/identityplatform/tenantoauthidpconfig/zz_controller.go index c7f005eb7..4069a4380 100755 --- a/internal/controller/identityplatform/tenantoauthidpconfig/zz_controller.go +++ b/internal/controller/identityplatform/tenantoauthidpconfig/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/kms/cryptokey/zz_controller.go b/internal/controller/kms/cryptokey/zz_controller.go index 168fa3022..316b725b9 100755 --- a/internal/controller/kms/cryptokey/zz_controller.go +++ b/internal/controller/kms/cryptokey/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/kms/cryptokeyiammember/zz_controller.go b/internal/controller/kms/cryptokeyiammember/zz_controller.go index d72e624cc..2af2bd13a 100755 --- a/internal/controller/kms/cryptokeyiammember/zz_controller.go +++ b/internal/controller/kms/cryptokeyiammember/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/kms/keyring/zz_controller.go b/internal/controller/kms/keyring/zz_controller.go index 2d35bd20e..1ef35a653 100755 --- a/internal/controller/kms/keyring/zz_controller.go +++ b/internal/controller/kms/keyring/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/kms/keyringiammember/zz_controller.go b/internal/controller/kms/keyringiammember/zz_controller.go index 2ad13810c..39ecb9c86 100755 --- a/internal/controller/kms/keyringiammember/zz_controller.go +++ b/internal/controller/kms/keyringiammember/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/kms/keyringimportjob/zz_controller.go b/internal/controller/kms/keyringimportjob/zz_controller.go index d11200b53..88a7dc7a7 100755 --- a/internal/controller/kms/keyringimportjob/zz_controller.go +++ b/internal/controller/kms/keyringimportjob/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/kms/secretciphertext/zz_controller.go b/internal/controller/kms/secretciphertext/zz_controller.go index c48892776..eb906a47d 100755 --- a/internal/controller/kms/secretciphertext/zz_controller.go +++ b/internal/controller/kms/secretciphertext/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/monitoring/alertpolicy/zz_controller.go b/internal/controller/monitoring/alertpolicy/zz_controller.go index e5bd3f255..7665ebf77 100755 --- a/internal/controller/monitoring/alertpolicy/zz_controller.go +++ b/internal/controller/monitoring/alertpolicy/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/monitoring/notificationchannel/zz_controller.go b/internal/controller/monitoring/notificationchannel/zz_controller.go index 846096959..8082931b1 100755 --- a/internal/controller/monitoring/notificationchannel/zz_controller.go +++ b/internal/controller/monitoring/notificationchannel/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/monitoring/uptimecheckconfig/zz_controller.go b/internal/controller/monitoring/uptimecheckconfig/zz_controller.go index 84fda1d1a..5a92d4e47 100755 --- a/internal/controller/monitoring/uptimecheckconfig/zz_controller.go +++ b/internal/controller/monitoring/uptimecheckconfig/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/notebooks/environment/zz_controller.go b/internal/controller/notebooks/environment/zz_controller.go index 88acb5c50..de0529937 100755 --- a/internal/controller/notebooks/environment/zz_controller.go +++ b/internal/controller/notebooks/environment/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/notebooks/instance/zz_controller.go b/internal/controller/notebooks/instance/zz_controller.go index 15fe6a808..59bd5d1a8 100755 --- a/internal/controller/notebooks/instance/zz_controller.go +++ b/internal/controller/notebooks/instance/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/notebooks/instanceiammember/zz_controller.go b/internal/controller/notebooks/instanceiammember/zz_controller.go index 86685ed47..2fe672ba0 100755 --- a/internal/controller/notebooks/instanceiammember/zz_controller.go +++ b/internal/controller/notebooks/instanceiammember/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/notebooks/runtime/zz_controller.go b/internal/controller/notebooks/runtime/zz_controller.go index 74b3d729a..10150cc2b 100755 --- a/internal/controller/notebooks/runtime/zz_controller.go +++ b/internal/controller/notebooks/runtime/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/notebooks/runtimeiammember/zz_controller.go b/internal/controller/notebooks/runtimeiammember/zz_controller.go index 9d31b274c..b4bd5aacc 100755 --- a/internal/controller/notebooks/runtimeiammember/zz_controller.go +++ b/internal/controller/notebooks/runtimeiammember/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/osconfig/ospolicyassignment/zz_controller.go b/internal/controller/osconfig/ospolicyassignment/zz_controller.go index f05a4caae..1ccffd6e4 100755 --- a/internal/controller/osconfig/ospolicyassignment/zz_controller.go +++ b/internal/controller/osconfig/ospolicyassignment/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/osconfig/patchdeployment/zz_controller.go b/internal/controller/osconfig/patchdeployment/zz_controller.go index c6ddde0c2..9e43acbf5 100755 --- a/internal/controller/osconfig/patchdeployment/zz_controller.go +++ b/internal/controller/osconfig/patchdeployment/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/oslogin/sshpublickey/zz_controller.go b/internal/controller/oslogin/sshpublickey/zz_controller.go index 969723f04..e9a3eddcf 100755 --- a/internal/controller/oslogin/sshpublickey/zz_controller.go +++ b/internal/controller/oslogin/sshpublickey/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/privateca/capool/zz_controller.go b/internal/controller/privateca/capool/zz_controller.go index f5cf3e8bd..3386ff80f 100755 --- a/internal/controller/privateca/capool/zz_controller.go +++ b/internal/controller/privateca/capool/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/privateca/capooliammember/zz_controller.go b/internal/controller/privateca/capooliammember/zz_controller.go index 48174fc67..d113e2b5f 100755 --- a/internal/controller/privateca/capooliammember/zz_controller.go +++ b/internal/controller/privateca/capooliammember/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/privateca/certificate/zz_controller.go b/internal/controller/privateca/certificate/zz_controller.go index e0f600d18..77122cd69 100755 --- a/internal/controller/privateca/certificate/zz_controller.go +++ b/internal/controller/privateca/certificate/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/privateca/certificateauthority/zz_controller.go b/internal/controller/privateca/certificateauthority/zz_controller.go index d971334f9..f3c45abf4 100755 --- a/internal/controller/privateca/certificateauthority/zz_controller.go +++ b/internal/controller/privateca/certificateauthority/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/privateca/certificatetemplate/zz_controller.go b/internal/controller/privateca/certificatetemplate/zz_controller.go index cbe1bfd84..df5e7ff6f 100755 --- a/internal/controller/privateca/certificatetemplate/zz_controller.go +++ b/internal/controller/privateca/certificatetemplate/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/privateca/certificatetemplateiammember/zz_controller.go b/internal/controller/privateca/certificatetemplateiammember/zz_controller.go index 25a503f7c..ba6940579 100755 --- a/internal/controller/privateca/certificatetemplateiammember/zz_controller.go +++ b/internal/controller/privateca/certificatetemplateiammember/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/pubsub/litereservation/zz_controller.go b/internal/controller/pubsub/litereservation/zz_controller.go index 122f9f68f..8796cded4 100755 --- a/internal/controller/pubsub/litereservation/zz_controller.go +++ b/internal/controller/pubsub/litereservation/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/pubsub/litesubscription/zz_controller.go b/internal/controller/pubsub/litesubscription/zz_controller.go index 63b090f81..9a4758daa 100755 --- a/internal/controller/pubsub/litesubscription/zz_controller.go +++ b/internal/controller/pubsub/litesubscription/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/pubsub/litetopic/zz_controller.go b/internal/controller/pubsub/litetopic/zz_controller.go index 17ee7b7c0..0be20ba15 100755 --- a/internal/controller/pubsub/litetopic/zz_controller.go +++ b/internal/controller/pubsub/litetopic/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/pubsub/schema/zz_controller.go b/internal/controller/pubsub/schema/zz_controller.go index fc02a2682..d8eb0f672 100755 --- a/internal/controller/pubsub/schema/zz_controller.go +++ b/internal/controller/pubsub/schema/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/pubsub/subscription/zz_controller.go b/internal/controller/pubsub/subscription/zz_controller.go index 5b2c83453..5a1a54efb 100755 --- a/internal/controller/pubsub/subscription/zz_controller.go +++ b/internal/controller/pubsub/subscription/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/pubsub/subscriptioniammember/zz_controller.go b/internal/controller/pubsub/subscriptioniammember/zz_controller.go index 46ff15958..7bde11946 100755 --- a/internal/controller/pubsub/subscriptioniammember/zz_controller.go +++ b/internal/controller/pubsub/subscriptioniammember/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/pubsub/topic/zz_controller.go b/internal/controller/pubsub/topic/zz_controller.go index 4f1ad50e5..6a364225c 100755 --- a/internal/controller/pubsub/topic/zz_controller.go +++ b/internal/controller/pubsub/topic/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/pubsub/topiciammember/zz_controller.go b/internal/controller/pubsub/topiciammember/zz_controller.go index 92da2f54a..d300d0ca5 100755 --- a/internal/controller/pubsub/topiciammember/zz_controller.go +++ b/internal/controller/pubsub/topiciammember/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/redis/instance/zz_controller.go b/internal/controller/redis/instance/zz_controller.go index f389e9404..cab5ee926 100755 --- a/internal/controller/redis/instance/zz_controller.go +++ b/internal/controller/redis/instance/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/secretmanager/secret/zz_controller.go b/internal/controller/secretmanager/secret/zz_controller.go index c9ed20b68..e33b48d5d 100755 --- a/internal/controller/secretmanager/secret/zz_controller.go +++ b/internal/controller/secretmanager/secret/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/secretmanager/secretiammember/zz_controller.go b/internal/controller/secretmanager/secretiammember/zz_controller.go index 4667b4722..f749c9558 100755 --- a/internal/controller/secretmanager/secretiammember/zz_controller.go +++ b/internal/controller/secretmanager/secretiammember/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/secretmanager/secretversion/zz_controller.go b/internal/controller/secretmanager/secretversion/zz_controller.go index 27150da69..888941015 100755 --- a/internal/controller/secretmanager/secretversion/zz_controller.go +++ b/internal/controller/secretmanager/secretversion/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/servicenetworking/connection/zz_controller.go b/internal/controller/servicenetworking/connection/zz_controller.go index 9180f9183..1d478fd8d 100755 --- a/internal/controller/servicenetworking/connection/zz_controller.go +++ b/internal/controller/servicenetworking/connection/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/sourcerepo/repository/zz_controller.go b/internal/controller/sourcerepo/repository/zz_controller.go index 00959269f..60695eae4 100755 --- a/internal/controller/sourcerepo/repository/zz_controller.go +++ b/internal/controller/sourcerepo/repository/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/sourcerepo/repositoryiammember/zz_controller.go b/internal/controller/sourcerepo/repositoryiammember/zz_controller.go index c5919d80c..b097848b0 100755 --- a/internal/controller/sourcerepo/repositoryiammember/zz_controller.go +++ b/internal/controller/sourcerepo/repositoryiammember/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/spanner/database/zz_controller.go b/internal/controller/spanner/database/zz_controller.go index b934b767f..a48426fd7 100755 --- a/internal/controller/spanner/database/zz_controller.go +++ b/internal/controller/spanner/database/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/spanner/databaseiammember/zz_controller.go b/internal/controller/spanner/databaseiammember/zz_controller.go index 2cea25327..3da2c7304 100755 --- a/internal/controller/spanner/databaseiammember/zz_controller.go +++ b/internal/controller/spanner/databaseiammember/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/spanner/instance/zz_controller.go b/internal/controller/spanner/instance/zz_controller.go index 82c8bf79c..66a7ec2d8 100755 --- a/internal/controller/spanner/instance/zz_controller.go +++ b/internal/controller/spanner/instance/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/spanner/instanceiammember/zz_controller.go b/internal/controller/spanner/instanceiammember/zz_controller.go index e0789f17a..4a3db3124 100755 --- a/internal/controller/spanner/instanceiammember/zz_controller.go +++ b/internal/controller/spanner/instanceiammember/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/sql/database/zz_controller.go b/internal/controller/sql/database/zz_controller.go index db43390e7..32b844809 100755 --- a/internal/controller/sql/database/zz_controller.go +++ b/internal/controller/sql/database/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/sql/databaseinstance/zz_controller.go b/internal/controller/sql/databaseinstance/zz_controller.go index 6ade7fe5f..d08ebbe71 100755 --- a/internal/controller/sql/databaseinstance/zz_controller.go +++ b/internal/controller/sql/databaseinstance/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/sql/sourcerepresentationinstance/zz_controller.go b/internal/controller/sql/sourcerepresentationinstance/zz_controller.go index 3c5cdc0ad..3d631e046 100755 --- a/internal/controller/sql/sourcerepresentationinstance/zz_controller.go +++ b/internal/controller/sql/sourcerepresentationinstance/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/sql/sslcert/zz_controller.go b/internal/controller/sql/sslcert/zz_controller.go index ac8950e78..b1625caea 100755 --- a/internal/controller/sql/sslcert/zz_controller.go +++ b/internal/controller/sql/sslcert/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/sql/user/zz_controller.go b/internal/controller/sql/user/zz_controller.go index 7a59bd02c..988731167 100755 --- a/internal/controller/sql/user/zz_controller.go +++ b/internal/controller/sql/user/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/storage/bucket/zz_controller.go b/internal/controller/storage/bucket/zz_controller.go index 7f9fcd50b..b25dc9b05 100755 --- a/internal/controller/storage/bucket/zz_controller.go +++ b/internal/controller/storage/bucket/zz_controller.go @@ -53,6 +53,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/storage/bucketaccesscontrol/zz_controller.go b/internal/controller/storage/bucketaccesscontrol/zz_controller.go index 52f2dfe41..c5f33335b 100755 --- a/internal/controller/storage/bucketaccesscontrol/zz_controller.go +++ b/internal/controller/storage/bucketaccesscontrol/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/storage/bucketacl/zz_controller.go b/internal/controller/storage/bucketacl/zz_controller.go index 60ece30c4..1702538a6 100755 --- a/internal/controller/storage/bucketacl/zz_controller.go +++ b/internal/controller/storage/bucketacl/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/storage/bucketiammember/zz_controller.go b/internal/controller/storage/bucketiammember/zz_controller.go index da60ebc83..8db92ab2d 100755 --- a/internal/controller/storage/bucketiammember/zz_controller.go +++ b/internal/controller/storage/bucketiammember/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/storage/bucketobject/zz_controller.go b/internal/controller/storage/bucketobject/zz_controller.go index 19c3ade93..809c65894 100755 --- a/internal/controller/storage/bucketobject/zz_controller.go +++ b/internal/controller/storage/bucketobject/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/storage/defaultobjectaccesscontrol/zz_controller.go b/internal/controller/storage/defaultobjectaccesscontrol/zz_controller.go index d9af662a2..914d80ac1 100755 --- a/internal/controller/storage/defaultobjectaccesscontrol/zz_controller.go +++ b/internal/controller/storage/defaultobjectaccesscontrol/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/storage/defaultobjectacl/zz_controller.go b/internal/controller/storage/defaultobjectacl/zz_controller.go index 6365ab1ce..6ccee3a4f 100755 --- a/internal/controller/storage/defaultobjectacl/zz_controller.go +++ b/internal/controller/storage/defaultobjectacl/zz_controller.go @@ -52,6 +52,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { managed.WithTimeout(3*time.Minute), managed.WithInitializers(initializers), managed.WithConnectionPublishers(cps...), + managed.WithPollInterval(o.PollInterval), ) return ctrl.NewControllerManagedBy(mgr). From d0394f08050c641f843378cb95089ed44cef213f Mon Sep 17 00:00:00 2001 From: Alper Rifat Ulucinar Date: Mon, 14 Nov 2022 14:35:37 +0300 Subject: [PATCH 2/2] Use the kingpin.v2 package for argument & flag parsing in the code generator - Consume upjet commit 6de200a3a8b0ac77c5f9d122f93db26aacd61960 Signed-off-by: Alper Rifat Ulucinar --- .github/workflows/ci.yml | 2 +- cmd/generator/main.go | 35 +++++++++++++++++++++++++++-------- go.mod | 4 +--- go.sum | 4 ++-- 4 files changed, 31 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e51259647..09db8659d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -248,7 +248,7 @@ jobs: BUILD_ARGS: "--load" - name: Publish Artifacts to GitHub - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: output path: _output/** diff --git a/cmd/generator/main.go b/cmd/generator/main.go index 69fab28ca..277183055 100644 --- a/cmd/generator/main.go +++ b/cmd/generator/main.go @@ -1,3 +1,17 @@ +// Copyright 2022 Upbound Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + package main import ( @@ -7,23 +21,28 @@ import ( "strings" "github.com/upbound/upjet/pkg/pipeline" + "gopkg.in/alecthomas/kingpin.v2" "github.com/upbound/provider-gcp/config" ) func main() { - if len(os.Args) < 2 || os.Args[1] == "" { - panic("root directory is required to be given as argument") - } - absRootDir, err := filepath.Abs(os.Args[1]) + var ( + app = kingpin.New("generator", "Run Upjet code generation pipelines for provider-gcp").DefaultEnvars() + repoRoot = app.Arg("repo-root", "Root directory for the provider repository").Required().String() + skippedResourcesCSV = app.Flag("skipped-resources-csv", "File path where a list of skipped (not-generated) Terraform resource names will be stored as a CSV").Envar("SKIPPED_RESOURCES_CSV").String() + ) + kingpin.MustParse(app.Parse(os.Args[1:])) + + absRootDir, err := filepath.Abs(*repoRoot) if err != nil { - panic(fmt.Sprintf("cannot calculate the absolute path of %s", os.Args[1])) + panic(fmt.Sprintf("cannot calculate the absolute path with %s", *repoRoot)) } p := config.GetProvider() pipeline.Run(p, absRootDir) - if fp := os.Getenv("SKIPPED_RESOURCES_CSV"); len(fp) != 0 { - if err := os.WriteFile(fp, []byte(strings.Join(p.GetSkippedResourceNames(), ",")), 0o600); err != nil { - panic(fmt.Sprintf("cannot write skipped resources CSV to file %s: %s", fp, err.Error())) + if len(*skippedResourcesCSV) != 0 { + if err := os.WriteFile(*skippedResourcesCSV, []byte(strings.Join(p.GetSkippedResourceNames(), "\n")), 0o600); err != nil { + panic(fmt.Sprintf("cannot write skipped resources CSV to file %s: %s", *skippedResourcesCSV, err.Error())) } } } diff --git a/go.mod b/go.mod index e32a7b834..8d96f4d33 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/crossplane/crossplane-tools v0.0.0-20220310165030-1f43fc12793e github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.0 github.com/pkg/errors v0.9.1 - github.com/upbound/upjet v0.7.0 + github.com/upbound/upjet v0.8.0-rc.0.0.20221111123128-6de200a3a8b0 gopkg.in/alecthomas/kingpin.v2 v2.2.6 k8s.io/apimachinery v0.25.0 k8s.io/client-go v0.25.0 @@ -142,5 +142,3 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect sigs.k8s.io/yaml v1.3.0 // indirect ) - -replace github.com/upbound/upjet => github.com/ulucinar/upbound-upjet v0.0.0-20221110144831-17aa3b94b882 diff --git a/go.sum b/go.sum index ce604a9f0..2430f9a0c 100644 --- a/go.sum +++ b/go.sum @@ -648,8 +648,8 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1 github.com/tmccombs/hcl2json v0.3.3 h1:+DLNYqpWE0CsOQiEZu+OZm5ZBImake3wtITYxQ8uLFQ= github.com/tmccombs/hcl2json v0.3.3/go.mod h1:Y2chtz2x9bAeRTvSibVRVgbLJhLJXKlUeIvjeVdnm4w= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= -github.com/ulucinar/upbound-upjet v0.0.0-20221110144831-17aa3b94b882 h1:X8sBFqLPia9Wd5HB6CzdoGpwtZNd9wH2hv8x4nuCYCk= -github.com/ulucinar/upbound-upjet v0.0.0-20221110144831-17aa3b94b882/go.mod h1:QyDjh8h49niORvHLHZE8ZS4fiCa6Dkcsw3aBJBfK3I8= +github.com/upbound/upjet v0.8.0-rc.0.0.20221111123128-6de200a3a8b0 h1:bYRc+p0Glihl+G+/3paLq9H/LiWUcEOqKZddQmyNrN0= +github.com/upbound/upjet v0.8.0-rc.0.0.20221111123128-6de200a3a8b0/go.mod h1:QyDjh8h49niORvHLHZE8ZS4fiCa6Dkcsw3aBJBfK3I8= github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI= github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=