🌱 clusterctl: add nutanix ipam & runtime extensions providers #11135
+99
−55
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -98,13 +98,19 @@ const ( | |||||
| // IPAM providers. | ||||||
| const ( | ||||||
| InClusterIPAMProviderName = "in-cluster" | ||||||
| NutanixIPAMProviderName = "nutanix" | ||||||
| ) | ||||||
|
|
||||||
| // Add-on providers. | ||||||
| const ( | ||||||
| HelmAddonProviderName = "helm" | ||||||
| ) | ||||||
|
|
||||||
| // Runtime extensions providers. | ||||||
| const ( | ||||||
| NutanixRuntimeExtensionsProviderName = "nutanix" | ||||||
|
There was a problem hiding this comment.
Suggested change
To follow the conventions at https://main.cluster-api.sigs.k8s.io/clusterctl/provider-contract.html#adding-a-provider-to-clusterctl |
||||||
| ) | ||||||
|
|
||||||
| // Other. | ||||||
| const ( | ||||||
| // ProvidersConfigKey is a constant for finding provider configurations with the ProvidersClient. | ||||||
|
|
@@ -404,13 +410,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/nitanix-cloud-native/cluster-api-runtime-extensions-nutanix/releases/latest/runtime-extensions-components.yaml", | ||||||
| providerType: clusterctlv1.RuntimeExtensionProviderType, | ||||||
| }, | ||||||
| } | ||||||
|
|
||||||
| return defaults | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To follow the conventions at https://main.cluster-api.sigs.k8s.io/clusterctl/provider-contract.html#adding-a-provider-to-clusterctl
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We already have an infra provider simply called nutanix at https://github.com/kubernetes-sigs/cluster-api/blob/main/cmd/clusterctl/client/config/providers_client.go#L55 and it would be great if we could use the same name for these other provider types for consistency 🙏
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good point. Maybe it's fine if a GitHub org already "claimed" the name via another provider
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would make sense. Fine for me if we have an agreement :-)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@fabriziopandini @vincepri WDYT?