Skip to content

Commit

Permalink
Merge pull request #11414 from jimmidyson/jimmi/1.8-add-caren-caipamx
Browse files Browse the repository at this point in the history
🌱 [release-1.8] clusterctl: add nutanix ipam & runtime extensions providers
  • Loading branch information
k8s-ci-robot authored Nov 13, 2024
2 parents a9979c5 + ed6ab17 commit 0110421
Show file tree
Hide file tree
Showing 6 changed files with 110 additions and 60 deletions.
18 changes: 18 additions & 0 deletions cmd/clusterctl/client/config/providers_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,19 @@ const (
// IPAM providers.
const (
InClusterIPAMProviderName = "in-cluster"
NutanixIPAMProviderName = "nutanix"
)

// Add-on providers.
const (
HelmAddonProviderName = "helm"
)

// Runtime extensions providers.
const (
NutanixRuntimeExtensionsProviderName = "nutanix"
)

// Other.
const (
// ProvidersConfigKey is a constant for finding provider configurations with the ProvidersClient.
Expand Down Expand Up @@ -410,13 +416,25 @@ func (p *providersClient) defaults() []Provider {
url: "https://github.com/kubernetes-sigs/cluster-api-ipam-provider-in-cluster/releases/latest/ipam-components.yaml",
providerType: clusterctlv1.IPAMProviderType,
},
&provider{
name: NutanixIPAMProviderName,
url: "https://github.com/nutanix-cloud-native/cluster-api-ipam-provider-nutanix/releases/latest/ipam-components.yaml",
providerType: clusterctlv1.IPAMProviderType,
},

// Add-on providers
&provider{
name: HelmAddonProviderName,
url: "https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/releases/latest/addon-components.yaml",
providerType: clusterctlv1.AddonProviderType,
},

// Runtime extensions providers
&provider{
name: NutanixRuntimeExtensionsProviderName,
url: "https://github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/releases/latest/runtime-extensions-components.yaml",
providerType: clusterctlv1.RuntimeExtensionProviderType,
},
}

return defaults
Expand Down
4 changes: 4 additions & 0 deletions cmd/clusterctl/client/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
config.VSphereProviderName,
config.VultrProviderName,
config.InClusterIPAMProviderName,
config.NutanixIPAMProviderName,
config.NutanixRuntimeExtensionsProviderName,
config.HelmAddonProviderName,
},
wantErr: false,
Expand Down Expand Up @@ -170,6 +172,8 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
config.VSphereProviderName,
config.VultrProviderName,
config.InClusterIPAMProviderName,
config.NutanixIPAMProviderName,
config.NutanixRuntimeExtensionsProviderName,
config.HelmAddonProviderName,
},
wantErr: false,
Expand Down
Loading

0 comments on commit 0110421

Please sign in to comment.