Skip to content

Commit 0110421

Browse files
authored
Merge pull request #11414 from jimmidyson/jimmi/1.8-add-caren-caipamx
🌱 [release-1.8] clusterctl: add nutanix ipam & runtime extensions providers
2 parents a9979c5 + ed6ab17 commit 0110421

File tree

6 files changed

+110
-60
lines changed

6 files changed

+110
-60
lines changed

cmd/clusterctl/client/config/providers_client.go

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,19 @@ const (
9999
// IPAM providers.
100100
const (
101101
InClusterIPAMProviderName = "in-cluster"
102+
NutanixIPAMProviderName = "nutanix"
102103
)
103104

104105
// Add-on providers.
105106
const (
106107
HelmAddonProviderName = "helm"
107108
)
108109

110+
// Runtime extensions providers.
111+
const (
112+
NutanixRuntimeExtensionsProviderName = "nutanix"
113+
)
114+
109115
// Other.
110116
const (
111117
// ProvidersConfigKey is a constant for finding provider configurations with the ProvidersClient.
@@ -410,13 +416,25 @@ func (p *providersClient) defaults() []Provider {
410416
url: "https://github.com/kubernetes-sigs/cluster-api-ipam-provider-in-cluster/releases/latest/ipam-components.yaml",
411417
providerType: clusterctlv1.IPAMProviderType,
412418
},
419+
&provider{
420+
name: NutanixIPAMProviderName,
421+
url: "https://github.com/nutanix-cloud-native/cluster-api-ipam-provider-nutanix/releases/latest/ipam-components.yaml",
422+
providerType: clusterctlv1.IPAMProviderType,
423+
},
413424

414425
// Add-on providers
415426
&provider{
416427
name: HelmAddonProviderName,
417428
url: "https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/releases/latest/addon-components.yaml",
418429
providerType: clusterctlv1.AddonProviderType,
419430
},
431+
432+
// Runtime extensions providers
433+
&provider{
434+
name: NutanixRuntimeExtensionsProviderName,
435+
url: "https://github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/releases/latest/runtime-extensions-components.yaml",
436+
providerType: clusterctlv1.RuntimeExtensionProviderType,
437+
},
420438
}
421439

422440
return defaults

cmd/clusterctl/client/config_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
107107
config.VSphereProviderName,
108108
config.VultrProviderName,
109109
config.InClusterIPAMProviderName,
110+
config.NutanixIPAMProviderName,
111+
config.NutanixRuntimeExtensionsProviderName,
110112
config.HelmAddonProviderName,
111113
},
112114
wantErr: false,
@@ -170,6 +172,8 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
170172
config.VSphereProviderName,
171173
config.VultrProviderName,
172174
config.InClusterIPAMProviderName,
175+
config.NutanixIPAMProviderName,
176+
config.NutanixRuntimeExtensionsProviderName,
173177
config.HelmAddonProviderName,
174178
},
175179
wantErr: false,

0 commit comments

Comments
 (0)