Skip to content

Commit ef063b6

Browse files
committed
fix: acm provider works with new provider/manager design
Signed-off-by: Calum Murray <[email protected]>
1 parent 85ba743 commit ef063b6

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

pkg/kubernetes/provider_acm_hub.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ type ACMProviderConfig struct {
4141
func (c *ACMProviderConfig) Validate() error {
4242
var err error = nil
4343

44-
if c.ClusterProxyAddonCAFile == "" {
44+
if c.ClusterProxyAddonHost == "" {
4545
err = errors.Join(err, fmt.Errorf("cluster_proxy_addon_host is required"))
4646
}
4747

@@ -146,9 +146,10 @@ func (m *Manager) IsACMHub() bool {
146146
return false
147147
}
148148

149-
func newACMHubClusterProvider(m *Manager, cfg *config.StaticConfig) (Provider, error) {
150-
if !m.IsInCluster() {
151-
return nil, fmt.Errorf("acm provider required in-cluster deployment")
149+
func newACMHubClusterProvider(cfg *config.StaticConfig) (Provider, error) {
150+
m, err := NewInClusterManager(cfg)
151+
if err != nil {
152+
return nil, fmt.Errorf("failed to create in-cluster Kubernetes Manager for acm-hub cluster provider strategy: %w", err)
152153
}
153154

154155
providerCfg, ok := cfg.GetProviderConfig(config.ClusterProviderACM)
@@ -159,14 +160,14 @@ func newACMHubClusterProvider(m *Manager, cfg *config.StaticConfig) (Provider, e
159160
return newACMClusterProvider(m, providerCfg.(*ACMProviderConfig), false)
160161
}
161162

162-
func newACMKubeConfigClusterProvider(m *Manager, cfg *config.StaticConfig) (Provider, error) {
163+
func newACMKubeConfigClusterProvider(cfg *config.StaticConfig) (Provider, error) {
163164
providerCfg, ok := cfg.GetProviderConfig(config.ClusterProviderACMKubeConfig)
164165
if !ok {
165166
return nil, fmt.Errorf("missing required config for strategy '%s'", config.ClusterProviderACMKubeConfig)
166167
}
167168

168169
acmKubeConfigProviderCfg := providerCfg.(*ACMKubeConfigProviderConfig)
169-
baseManager, err := m.newForContext(acmKubeConfigProviderCfg.ContextName)
170+
baseManager, err := NewKubeconfigManager(cfg, acmKubeConfigProviderCfg.ContextName)
170171
if err != nil {
171172
return nil, fmt.Errorf(
172173
"failed to create manager to hub cluster specified by acm_context_name %s: %w",

0 commit comments

Comments
 (0)