diff --git a/Makefile b/Makefile index 05082db..08fd48d 100644 --- a/Makefile +++ b/Makefile @@ -49,9 +49,9 @@ GO_SUBDIRS += cmd internal apis # Setup Kubernetes tools KIND_VERSION = v0.17.0 -UP_VERSION = v0.15.0 +UP_VERSION = v0.17.0 UP_CHANNEL = stable -UPTEST_VERSION = v0.2.1 +UPTEST_VERSION = v0.5.0 -include build/makelib/k8s_tools.mk # ==================================================================================== diff --git a/build b/build index 7da2fde..bd5297b 160000 --- a/build +++ b/build @@ -1 +1 @@ -Subproject commit 7da2fdeb3dc1ebbce8210a58616debe34ef0fd97 +Subproject commit bd5297bd16c113cbc5ed1905b1d96aa1cb3078ec diff --git a/examples/install.yaml b/examples/install.yaml index ad38f98..13c91ec 100644 --- a/examples/install.yaml +++ b/examples/install.yaml @@ -3,4 +3,4 @@ kind: Provider metadata: name: provider-linode spec: - package: linode/provider-linode:v0.0.8 + package: linode/provider-linode:v0.0.11 diff --git a/go.mod b/go.mod index f9b710b..86f1fdd 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/crossplane/crossplane-runtime v0.20.0-rc.0.0.20230406155702-4e1673b7141f github.com/crossplane/crossplane-tools v0.0.0-20230327091744-4236bf732aa5 github.com/pkg/errors v0.9.1 - github.com/upbound/upjet v0.9.0-rc.0.0.20230413124512-01e5c1fafb42 + github.com/upbound/upjet v0.9.0-rc.0.0.20230502154751-645d7260d814 gopkg.in/alecthomas/kingpin.v2 v2.2.6 k8s.io/apimachinery v0.26.3 k8s.io/client-go v0.26.3 diff --git a/go.sum b/go.sum index 82ba238..5b5070b 100644 --- a/go.sum +++ b/go.sum @@ -508,8 +508,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO 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.9.0-rc.0.0.20230413124512-01e5c1fafb42 h1:kEpQ3I4YXkdatz/dT8LvvFUHbJTPw4SBz4SdFmPS/vw= -github.com/upbound/upjet v0.9.0-rc.0.0.20230413124512-01e5c1fafb42/go.mod h1:IhrO+1L/Ieq7ZCORhiuZ4sShOzl/GoVGVjq0+JCMDYo= +github.com/upbound/upjet v0.9.0-rc.0.0.20230502154751-645d7260d814 h1:lsVgo6tcAXmdHCoPgo0HT67rtYQ4DRzUeNJ2lh9Qhm0= +github.com/upbound/upjet v0.9.0-rc.0.0.20230502154751-645d7260d814/go.mod h1:CWxJ9YTMy7q+bDc2W504ocL/ZzBmWabwwcRjIaP7CKc= 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/database/accesscontrols/zz_controller.go b/internal/controller/database/accesscontrols/zz_controller.go index f0f1ecb..a86fead 100755 --- a/internal/controller/database/accesscontrols/zz_controller.go +++ b/internal/controller/database/accesscontrols/zz_controller.go @@ -27,7 +27,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { var initializers managed.InitializerChain cps := []managed.ConnectionPublisher{managed.NewAPISecretPublisher(mgr.GetClient(), mgr.GetScheme())} if o.SecretStoreConfigGVK != nil { - cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK)) + cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(tjcontroller.NewConnector(mgr.GetClient(), o.WorkspaceStore, o.SetupFn, o.Provider.Resources["linode_database_access_controls"], tjcontroller.WithLogger(o.Logger), diff --git a/internal/controller/database/mysql/zz_controller.go b/internal/controller/database/mysql/zz_controller.go index 75a3a0b..143c167 100755 --- a/internal/controller/database/mysql/zz_controller.go +++ b/internal/controller/database/mysql/zz_controller.go @@ -27,7 +27,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { var initializers managed.InitializerChain cps := []managed.ConnectionPublisher{managed.NewAPISecretPublisher(mgr.GetClient(), mgr.GetScheme())} if o.SecretStoreConfigGVK != nil { - cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK)) + cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(tjcontroller.NewConnector(mgr.GetClient(), o.WorkspaceStore, o.SetupFn, o.Provider.Resources["linode_database_mysql"], tjcontroller.WithLogger(o.Logger), diff --git a/internal/controller/database/postgresql/zz_controller.go b/internal/controller/database/postgresql/zz_controller.go index ae1c956..f5b18bb 100755 --- a/internal/controller/database/postgresql/zz_controller.go +++ b/internal/controller/database/postgresql/zz_controller.go @@ -27,7 +27,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { var initializers managed.InitializerChain cps := []managed.ConnectionPublisher{managed.NewAPISecretPublisher(mgr.GetClient(), mgr.GetScheme())} if o.SecretStoreConfigGVK != nil { - cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK)) + cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(tjcontroller.NewConnector(mgr.GetClient(), o.WorkspaceStore, o.SetupFn, o.Provider.Resources["linode_database_postgresql"], tjcontroller.WithLogger(o.Logger), diff --git a/internal/controller/domain/domain/zz_controller.go b/internal/controller/domain/domain/zz_controller.go index d22b9e2..7be0340 100755 --- a/internal/controller/domain/domain/zz_controller.go +++ b/internal/controller/domain/domain/zz_controller.go @@ -27,7 +27,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { var initializers managed.InitializerChain cps := []managed.ConnectionPublisher{managed.NewAPISecretPublisher(mgr.GetClient(), mgr.GetScheme())} if o.SecretStoreConfigGVK != nil { - cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK)) + cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(tjcontroller.NewConnector(mgr.GetClient(), o.WorkspaceStore, o.SetupFn, o.Provider.Resources["linode_domain"], tjcontroller.WithLogger(o.Logger), diff --git a/internal/controller/domain/record/zz_controller.go b/internal/controller/domain/record/zz_controller.go index 513427a..6834907 100755 --- a/internal/controller/domain/record/zz_controller.go +++ b/internal/controller/domain/record/zz_controller.go @@ -27,7 +27,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { var initializers managed.InitializerChain cps := []managed.ConnectionPublisher{managed.NewAPISecretPublisher(mgr.GetClient(), mgr.GetScheme())} if o.SecretStoreConfigGVK != nil { - cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK)) + cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(tjcontroller.NewConnector(mgr.GetClient(), o.WorkspaceStore, o.SetupFn, o.Provider.Resources["linode_domain_record"], tjcontroller.WithLogger(o.Logger), diff --git a/internal/controller/firewall/device/zz_controller.go b/internal/controller/firewall/device/zz_controller.go index c11c2e0..cdc459e 100755 --- a/internal/controller/firewall/device/zz_controller.go +++ b/internal/controller/firewall/device/zz_controller.go @@ -27,7 +27,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { var initializers managed.InitializerChain cps := []managed.ConnectionPublisher{managed.NewAPISecretPublisher(mgr.GetClient(), mgr.GetScheme())} if o.SecretStoreConfigGVK != nil { - cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK)) + cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(tjcontroller.NewConnector(mgr.GetClient(), o.WorkspaceStore, o.SetupFn, o.Provider.Resources["linode_firewall_device"], tjcontroller.WithLogger(o.Logger), diff --git a/internal/controller/firewall/firewall/zz_controller.go b/internal/controller/firewall/firewall/zz_controller.go index 2075f2f..1b37f87 100755 --- a/internal/controller/firewall/firewall/zz_controller.go +++ b/internal/controller/firewall/firewall/zz_controller.go @@ -27,7 +27,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { var initializers managed.InitializerChain cps := []managed.ConnectionPublisher{managed.NewAPISecretPublisher(mgr.GetClient(), mgr.GetScheme())} if o.SecretStoreConfigGVK != nil { - cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK)) + cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(tjcontroller.NewConnector(mgr.GetClient(), o.WorkspaceStore, o.SetupFn, o.Provider.Resources["linode_firewall"], tjcontroller.WithLogger(o.Logger), diff --git a/internal/controller/image/image/zz_controller.go b/internal/controller/image/image/zz_controller.go index 8cb08a0..18f44dc 100755 --- a/internal/controller/image/image/zz_controller.go +++ b/internal/controller/image/image/zz_controller.go @@ -27,7 +27,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { var initializers managed.InitializerChain cps := []managed.ConnectionPublisher{managed.NewAPISecretPublisher(mgr.GetClient(), mgr.GetScheme())} if o.SecretStoreConfigGVK != nil { - cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK)) + cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(tjcontroller.NewConnector(mgr.GetClient(), o.WorkspaceStore, o.SetupFn, o.Provider.Resources["linode_image"], tjcontroller.WithLogger(o.Logger), diff --git a/internal/controller/instance/config/zz_controller.go b/internal/controller/instance/config/zz_controller.go index 8eaca4a..4292cc2 100755 --- a/internal/controller/instance/config/zz_controller.go +++ b/internal/controller/instance/config/zz_controller.go @@ -27,7 +27,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { var initializers managed.InitializerChain cps := []managed.ConnectionPublisher{managed.NewAPISecretPublisher(mgr.GetClient(), mgr.GetScheme())} if o.SecretStoreConfigGVK != nil { - cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK)) + cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(tjcontroller.NewConnector(mgr.GetClient(), o.WorkspaceStore, o.SetupFn, o.Provider.Resources["linode_instance_config"], tjcontroller.WithLogger(o.Logger), diff --git a/internal/controller/instance/disk/zz_controller.go b/internal/controller/instance/disk/zz_controller.go index 50092f8..6b0c147 100755 --- a/internal/controller/instance/disk/zz_controller.go +++ b/internal/controller/instance/disk/zz_controller.go @@ -27,7 +27,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { var initializers managed.InitializerChain cps := []managed.ConnectionPublisher{managed.NewAPISecretPublisher(mgr.GetClient(), mgr.GetScheme())} if o.SecretStoreConfigGVK != nil { - cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK)) + cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(tjcontroller.NewConnector(mgr.GetClient(), o.WorkspaceStore, o.SetupFn, o.Provider.Resources["linode_instance_disk"], tjcontroller.WithLogger(o.Logger), diff --git a/internal/controller/instance/instance/zz_controller.go b/internal/controller/instance/instance/zz_controller.go index d7153e7..92de955 100755 --- a/internal/controller/instance/instance/zz_controller.go +++ b/internal/controller/instance/instance/zz_controller.go @@ -27,7 +27,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { var initializers managed.InitializerChain cps := []managed.ConnectionPublisher{managed.NewAPISecretPublisher(mgr.GetClient(), mgr.GetScheme())} if o.SecretStoreConfigGVK != nil { - cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK)) + cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(tjcontroller.NewConnector(mgr.GetClient(), o.WorkspaceStore, o.SetupFn, o.Provider.Resources["linode_instance"], tjcontroller.WithLogger(o.Logger), diff --git a/internal/controller/instance/ip/zz_controller.go b/internal/controller/instance/ip/zz_controller.go index 5974d03..7c706cc 100755 --- a/internal/controller/instance/ip/zz_controller.go +++ b/internal/controller/instance/ip/zz_controller.go @@ -27,7 +27,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { var initializers managed.InitializerChain cps := []managed.ConnectionPublisher{managed.NewAPISecretPublisher(mgr.GetClient(), mgr.GetScheme())} if o.SecretStoreConfigGVK != nil { - cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK)) + cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(tjcontroller.NewConnector(mgr.GetClient(), o.WorkspaceStore, o.SetupFn, o.Provider.Resources["linode_instance_ip"], tjcontroller.WithLogger(o.Logger), diff --git a/internal/controller/instance/sharedips/zz_controller.go b/internal/controller/instance/sharedips/zz_controller.go index 19ce446..8679ef7 100755 --- a/internal/controller/instance/sharedips/zz_controller.go +++ b/internal/controller/instance/sharedips/zz_controller.go @@ -27,7 +27,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { var initializers managed.InitializerChain cps := []managed.ConnectionPublisher{managed.NewAPISecretPublisher(mgr.GetClient(), mgr.GetScheme())} if o.SecretStoreConfigGVK != nil { - cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK)) + cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(tjcontroller.NewConnector(mgr.GetClient(), o.WorkspaceStore, o.SetupFn, o.Provider.Resources["linode_instance_shared_ips"], tjcontroller.WithLogger(o.Logger), diff --git a/internal/controller/ipv6/ipv6range/zz_controller.go b/internal/controller/ipv6/ipv6range/zz_controller.go index 1cc22b7..a8b79a1 100755 --- a/internal/controller/ipv6/ipv6range/zz_controller.go +++ b/internal/controller/ipv6/ipv6range/zz_controller.go @@ -27,7 +27,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { var initializers managed.InitializerChain cps := []managed.ConnectionPublisher{managed.NewAPISecretPublisher(mgr.GetClient(), mgr.GetScheme())} if o.SecretStoreConfigGVK != nil { - cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK)) + cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(tjcontroller.NewConnector(mgr.GetClient(), o.WorkspaceStore, o.SetupFn, o.Provider.Resources["linode_ipv6_range"], tjcontroller.WithLogger(o.Logger), diff --git a/internal/controller/lke/cluster/zz_controller.go b/internal/controller/lke/cluster/zz_controller.go index 7a6ebce..e0610a6 100755 --- a/internal/controller/lke/cluster/zz_controller.go +++ b/internal/controller/lke/cluster/zz_controller.go @@ -27,7 +27,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { var initializers managed.InitializerChain cps := []managed.ConnectionPublisher{managed.NewAPISecretPublisher(mgr.GetClient(), mgr.GetScheme())} if o.SecretStoreConfigGVK != nil { - cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK)) + cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(tjcontroller.NewConnector(mgr.GetClient(), o.WorkspaceStore, o.SetupFn, o.Provider.Resources["linode_lke_cluster"], tjcontroller.WithLogger(o.Logger), diff --git a/internal/controller/nodebalancer/config/zz_controller.go b/internal/controller/nodebalancer/config/zz_controller.go index 8fc371c..35e3fbc 100755 --- a/internal/controller/nodebalancer/config/zz_controller.go +++ b/internal/controller/nodebalancer/config/zz_controller.go @@ -27,7 +27,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { var initializers managed.InitializerChain cps := []managed.ConnectionPublisher{managed.NewAPISecretPublisher(mgr.GetClient(), mgr.GetScheme())} if o.SecretStoreConfigGVK != nil { - cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK)) + cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(tjcontroller.NewConnector(mgr.GetClient(), o.WorkspaceStore, o.SetupFn, o.Provider.Resources["linode_nodebalancer_config"], tjcontroller.WithLogger(o.Logger), diff --git a/internal/controller/nodebalancer/node/zz_controller.go b/internal/controller/nodebalancer/node/zz_controller.go index 710ea21..104259f 100755 --- a/internal/controller/nodebalancer/node/zz_controller.go +++ b/internal/controller/nodebalancer/node/zz_controller.go @@ -27,7 +27,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { var initializers managed.InitializerChain cps := []managed.ConnectionPublisher{managed.NewAPISecretPublisher(mgr.GetClient(), mgr.GetScheme())} if o.SecretStoreConfigGVK != nil { - cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK)) + cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(tjcontroller.NewConnector(mgr.GetClient(), o.WorkspaceStore, o.SetupFn, o.Provider.Resources["linode_nodebalancer_node"], tjcontroller.WithLogger(o.Logger), diff --git a/internal/controller/nodebalancer/nodebalancer/zz_controller.go b/internal/controller/nodebalancer/nodebalancer/zz_controller.go index a4b2ca9..ccddaf7 100755 --- a/internal/controller/nodebalancer/nodebalancer/zz_controller.go +++ b/internal/controller/nodebalancer/nodebalancer/zz_controller.go @@ -27,7 +27,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { var initializers managed.InitializerChain cps := []managed.ConnectionPublisher{managed.NewAPISecretPublisher(mgr.GetClient(), mgr.GetScheme())} if o.SecretStoreConfigGVK != nil { - cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK)) + cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(tjcontroller.NewConnector(mgr.GetClient(), o.WorkspaceStore, o.SetupFn, o.Provider.Resources["linode_nodebalancer"], tjcontroller.WithLogger(o.Logger), diff --git a/internal/controller/objectstorage/bucket/zz_controller.go b/internal/controller/objectstorage/bucket/zz_controller.go index de8cbac..999600e 100755 --- a/internal/controller/objectstorage/bucket/zz_controller.go +++ b/internal/controller/objectstorage/bucket/zz_controller.go @@ -27,7 +27,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { var initializers managed.InitializerChain cps := []managed.ConnectionPublisher{managed.NewAPISecretPublisher(mgr.GetClient(), mgr.GetScheme())} if o.SecretStoreConfigGVK != nil { - cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK)) + cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(tjcontroller.NewConnector(mgr.GetClient(), o.WorkspaceStore, o.SetupFn, o.Provider.Resources["linode_object_storage_bucket"], tjcontroller.WithLogger(o.Logger), diff --git a/internal/controller/objectstorage/key/zz_controller.go b/internal/controller/objectstorage/key/zz_controller.go index 90aec5b..23f00a3 100755 --- a/internal/controller/objectstorage/key/zz_controller.go +++ b/internal/controller/objectstorage/key/zz_controller.go @@ -27,7 +27,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { var initializers managed.InitializerChain cps := []managed.ConnectionPublisher{managed.NewAPISecretPublisher(mgr.GetClient(), mgr.GetScheme())} if o.SecretStoreConfigGVK != nil { - cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK)) + cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(tjcontroller.NewConnector(mgr.GetClient(), o.WorkspaceStore, o.SetupFn, o.Provider.Resources["linode_object_storage_key"], tjcontroller.WithLogger(o.Logger), diff --git a/internal/controller/objectstorage/object/zz_controller.go b/internal/controller/objectstorage/object/zz_controller.go index 457a8fe..742f0cb 100755 --- a/internal/controller/objectstorage/object/zz_controller.go +++ b/internal/controller/objectstorage/object/zz_controller.go @@ -27,7 +27,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { var initializers managed.InitializerChain cps := []managed.ConnectionPublisher{managed.NewAPISecretPublisher(mgr.GetClient(), mgr.GetScheme())} if o.SecretStoreConfigGVK != nil { - cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK)) + cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(tjcontroller.NewConnector(mgr.GetClient(), o.WorkspaceStore, o.SetupFn, o.Provider.Resources["linode_object_storage_object"], tjcontroller.WithLogger(o.Logger), diff --git a/internal/controller/rdns/rdns/zz_controller.go b/internal/controller/rdns/rdns/zz_controller.go index 2e2ff86..6cdfdcf 100755 --- a/internal/controller/rdns/rdns/zz_controller.go +++ b/internal/controller/rdns/rdns/zz_controller.go @@ -27,7 +27,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { var initializers managed.InitializerChain cps := []managed.ConnectionPublisher{managed.NewAPISecretPublisher(mgr.GetClient(), mgr.GetScheme())} if o.SecretStoreConfigGVK != nil { - cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK)) + cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(tjcontroller.NewConnector(mgr.GetClient(), o.WorkspaceStore, o.SetupFn, o.Provider.Resources["linode_rdns"], tjcontroller.WithLogger(o.Logger), diff --git a/internal/controller/sshkey/sshkey/zz_controller.go b/internal/controller/sshkey/sshkey/zz_controller.go index 03b9e8a..46af826 100755 --- a/internal/controller/sshkey/sshkey/zz_controller.go +++ b/internal/controller/sshkey/sshkey/zz_controller.go @@ -27,7 +27,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { var initializers managed.InitializerChain cps := []managed.ConnectionPublisher{managed.NewAPISecretPublisher(mgr.GetClient(), mgr.GetScheme())} if o.SecretStoreConfigGVK != nil { - cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK)) + cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(tjcontroller.NewConnector(mgr.GetClient(), o.WorkspaceStore, o.SetupFn, o.Provider.Resources["linode_sshkey"], tjcontroller.WithLogger(o.Logger), diff --git a/internal/controller/stackscript/stackscript/zz_controller.go b/internal/controller/stackscript/stackscript/zz_controller.go index 26a4fad..473ac98 100755 --- a/internal/controller/stackscript/stackscript/zz_controller.go +++ b/internal/controller/stackscript/stackscript/zz_controller.go @@ -27,7 +27,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { var initializers managed.InitializerChain cps := []managed.ConnectionPublisher{managed.NewAPISecretPublisher(mgr.GetClient(), mgr.GetScheme())} if o.SecretStoreConfigGVK != nil { - cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK)) + cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(tjcontroller.NewConnector(mgr.GetClient(), o.WorkspaceStore, o.SetupFn, o.Provider.Resources["linode_stackscript"], tjcontroller.WithLogger(o.Logger), diff --git a/internal/controller/token/token/zz_controller.go b/internal/controller/token/token/zz_controller.go index 547d9d8..b51d0dc 100755 --- a/internal/controller/token/token/zz_controller.go +++ b/internal/controller/token/token/zz_controller.go @@ -27,7 +27,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { var initializers managed.InitializerChain cps := []managed.ConnectionPublisher{managed.NewAPISecretPublisher(mgr.GetClient(), mgr.GetScheme())} if o.SecretStoreConfigGVK != nil { - cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK)) + cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(tjcontroller.NewConnector(mgr.GetClient(), o.WorkspaceStore, o.SetupFn, o.Provider.Resources["linode_token"], tjcontroller.WithLogger(o.Logger), diff --git a/internal/controller/user/user/zz_controller.go b/internal/controller/user/user/zz_controller.go index 32d9d81..5594902 100755 --- a/internal/controller/user/user/zz_controller.go +++ b/internal/controller/user/user/zz_controller.go @@ -27,7 +27,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { var initializers managed.InitializerChain cps := []managed.ConnectionPublisher{managed.NewAPISecretPublisher(mgr.GetClient(), mgr.GetScheme())} if o.SecretStoreConfigGVK != nil { - cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK)) + cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(tjcontroller.NewConnector(mgr.GetClient(), o.WorkspaceStore, o.SetupFn, o.Provider.Resources["linode_user"], tjcontroller.WithLogger(o.Logger), diff --git a/internal/controller/volume/volume/zz_controller.go b/internal/controller/volume/volume/zz_controller.go index 327000a..eeba6af 100755 --- a/internal/controller/volume/volume/zz_controller.go +++ b/internal/controller/volume/volume/zz_controller.go @@ -27,7 +27,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { var initializers managed.InitializerChain cps := []managed.ConnectionPublisher{managed.NewAPISecretPublisher(mgr.GetClient(), mgr.GetScheme())} if o.SecretStoreConfigGVK != nil { - cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK)) + cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK, connection.WithTLSConfig(o.ESSOptions.TLSConfig))) } opts := []managed.ReconcilerOption{ managed.WithExternalConnecter(tjcontroller.NewConnector(mgr.GetClient(), o.WorkspaceStore, o.SetupFn, o.Provider.Resources["linode_volume"], tjcontroller.WithLogger(o.Logger),