kubernetes-sigs · k8s-ci-robot · Apr 6, 2022 · Mar 29, 2022
diff --git a/cmd/clusterctl/client/config/providers_client.go b/cmd/clusterctl/client/config/providers_client.go
@@ -45,6 +45,7 @@ const (
 	IBMCloudProviderName  = "ibmcloud"
 	Metal3ProviderName    = "metal3"
 	NestedProviderName    = "nested"
+	NutanixProviderName   = "nutanix"
 	OCIProviderName       = "oci"
 	OpenStackProviderName = "openstack"
 	PacketProviderName    = "packet"
@@ -196,6 +197,11 @@ func (p *providersClient) defaults() []Provider {
 			url:          "https://github.com/kubernetes-sigs/cluster-api-provider-ibmcloud/releases/latest/infrastructure-components.yaml",
 			providerType: clusterctlv1.InfrastructureProviderType,
 		},
+		&provider{
+			name:         NutanixProviderName,
+			url:          "https://github.com/nutanix-cloud-native/cluster-api-provider-nutanix/releases/latest/infrastructure-components.yaml",
+			providerType: clusterctlv1.InfrastructureProviderType,
+		},
 
 		// Bootstrap providers
 		&provider{

diff --git a/cmd/clusterctl/client/config_test.go b/cmd/clusterctl/client/config_test.go
@@ -74,6 +74,7 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
 				config.MAASProviderName,
 				config.Metal3ProviderName,
 				config.NestedProviderName,
+				config.NutanixProviderName,
 				config.OCIProviderName,
 				config.OpenStackProviderName,
 				config.PacketProviderName,
@@ -109,6 +110,7 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
 				config.MAASProviderName,
 				config.Metal3ProviderName,
 				config.NestedProviderName,
+				config.NutanixProviderName,
 				config.OCIProviderName,
 				config.OpenStackProviderName,
 				config.PacketProviderName,

diff --git a/cmd/clusterctl/cmd/config_repositories_test.go b/cmd/clusterctl/cmd/config_repositories_test.go
@@ -121,6 +121,7 @@ maas                InfrastructureProvider   https://github.com/spectrocloud/clu
 metal3              InfrastructureProvider   https://github.com/metal3-io/cluster-api-provider-metal3/releases/latest/                 infrastructure-components.yaml
 my-infra-provider   InfrastructureProvider   /home/.cluster-api/overrides/infrastructure-docker/latest/                                infrastructure-components.yaml
 nested              InfrastructureProvider   https://github.com/kubernetes-sigs/cluster-api-provider-nested/releases/latest/           infrastructure-components.yaml
+nutanix             InfrastructureProvider   https://github.com/nutanix-cloud-native/cluster-api-provider-nutanix/releases/latest/     infrastructure-components.yaml
 oci                 InfrastructureProvider   https://github.com/oracle/cluster-api-provider-oci/releases/latest/                       infrastructure-components.yaml
 openstack           InfrastructureProvider   https://github.com/kubernetes-sigs/cluster-api-provider-openstack/releases/latest/        infrastructure-components.yaml
 packet              InfrastructureProvider   https://github.com/kubernetes-sigs/cluster-api-provider-packet/releases/latest/           infrastructure-components.yaml
@@ -212,6 +213,10 @@ var expectedOutputYaml = `- File: core_components.yaml
   Name: nested
   ProviderType: InfrastructureProvider
   URL: https://github.com/kubernetes-sigs/cluster-api-provider-nested/releases/latest/
+- File: infrastructure-components.yaml
+  Name: nutanix
+  ProviderType: InfrastructureProvider
+  URL: https://github.com/nutanix-cloud-native/cluster-api-provider-nutanix/releases/latest/
 - File: infrastructure-components.yaml
   Name: oci
   ProviderType: InfrastructureProvider

diff --git a/docs/book/src/clusterctl/provider-contract.md b/docs/book/src/clusterctl/provider-contract.md
@@ -202,6 +202,7 @@ providers.
 |CAPO          | cluster.x-k8s.io/provider=infrastructure-openstack     |
 |CAPDO         | cluster.x-k8s.io/provider=infrastructure-digitalocean  |
 |CAPG          | cluster.x-k8s.io/provider=infrastructure-gcp           |
+|CAPX          | cluster.x-k8s.io/provider=infrastructure-nutanix       |
 
 ### Workload cluster templates
 

diff --git a/docs/book/src/reference/glossary.md b/docs/book/src/reference/glossary.md
@@ -56,6 +56,9 @@ Cluster API Provider IBM Cloud
 ### CAPN
 Cluster API Provider Nested
 
+### CAPX
+Cluster API Provider Nutanix
+
 ### CAPO
 Cluster API Provider OpenStack
 

diff --git a/docs/book/src/reference/providers.md b/docs/book/src/reference/providers.md
@@ -26,6 +26,7 @@ updated info about which API version they are supporting.
 - [KubeVirt](https://github.com/kubernetes-sigs/cluster-api-provider-kubevirt)
 - [MAAS](https://github.com/spectrocloud/cluster-api-provider-maas)
 - [Nested](https://github.com/kubernetes-sigs/cluster-api-provider-nested)
+- [Nutanix](https://github.com/nutanix-cloud-native/cluster-api-provider-nutanix)
 - [OpenStack](https://github.com/kubernetes-sigs/cluster-api-provider-openstack)
 - [Equinix Metal (formerly Packet)](https://github.com/kubernetes-sigs/cluster-api-provider-packet)
 - [Sidero](https://github.com/siderolabs/sidero)

diff --git a/docs/book/src/user/quick-start.md b/docs/book/src/user/quick-start.md
@@ -185,7 +185,7 @@ Additional documentation about experimental features can be found in [Experiment
 Depending on the infrastructure provider you are planning to use, some additional prerequisites should be satisfied
 before getting started with Cluster API. See below for the expected settings for common providers.
 
-{{#tabs name:"tab-installation-infrastructure" tabs:"AWS,Azure,DigitalOcean,Docker,Equinix Metal,GCP,Hetzner,Metal3,OCI,OpenStack,vSphere"}}
+{{#tabs name:"tab-installation-infrastructure" tabs:"AWS,Azure,DigitalOcean,Docker,Equinix Metal,GCP,Hetzner,Metal3,Nutanix,OCI,OpenStack,vSphere"}}
 {{#tab AWS}}
 
 Download the latest binary of `clusterawsadm` from the [AWS provider releases] and make sure to place it in your path.
@@ -312,6 +312,11 @@ Please visit the [Hetzner project][Hetzner provider].
 
 Please visit the [Metal3 project][Metal3 provider].
 
+{{#/tab }}
+{{#tab Nutanix}}
+
+Please follow the Cluster API Provider for [Nutanix Getting Started Guide](https://github.com/nutanix-cloud-native/cluster-api-provider-nutanix/blob/main/docs/getting_started.md)
+
 {{#/tab }}
 {{#tab OCI}}
 
@@ -412,7 +417,7 @@ before configuring a cluster with Cluster API. Instructions are provided for com
 Otherwise, you can look at the `clusterctl generate cluster` [command][clusterctl generate cluster] documentation for details about how to
 discover the list of variables required by a cluster templates.
 
-{{#tabs name:"tab-configuration-infrastructure" tabs:"AWS,Azure,DigitalOcean,Docker,Equinix Metal,GCP,Metal3,OpenStack,vSphere"}}
+{{#tabs name:"tab-configuration-infrastructure" tabs:"AWS,Azure,DigitalOcean,Docker,Equinix Metal,GCP,Metal3,Nutanix,OpenStack,vSphere"}}
 {{#tab AWS}}
 
 ```bash
@@ -558,6 +563,18 @@ export IRONIC_INSPECTOR_NO_BASIC_AUTH=true
 
 Please visit the [Metal3 getting started guide] for more details.
 
+{{#/tab }}
+{{#tab Nutanix}}
+
+A ClusterAPI compatible image must be available in your Nutanix image library. For instructions on how to build a compatible image
+see [image-builder](https://image-builder.sigs.k8s.io/capi/capi.html).
+
+To see all required Nutanix environment variables execute:
+```bash
+clusterctl generate cluster --infrastructure nutanix --list-variables capi-quickstart
+```
+
+
 {{#/tab }}
 {{#tab OpenStack}}
 
@@ -638,7 +655,7 @@ For more information about prerequisites, credentials management, or permissions
 
 For the purpose of this tutorial, we'll name our cluster capi-quickstart.
 
-{{#tabs name:"tab-clusterctl-config-cluster" tabs:"Azure|AWS|DigitalOcean|Equinix Metal|GCP|Metal3|OpenStack|vSphere,Docker"}}
+{{#tabs name:"tab-clusterctl-config-cluster" tabs:"Azure|AWS|DigitalOcean|Equinix Metal|GCP|Metal3|Nutanix|OpenStack|vSphere,Docker"}}
 {{#tab Azure|AWS|DigitalOcean|Equinix Metal|GCP|Metal3|OpenStack|vSphere}}
 
 ```bash
@@ -763,7 +780,7 @@ See [Additional Notes for the Docker Provider](../clusterctl/developers.md#addit
 
 Calico is used here as an example.
 
-{{#tabs name:"tab-deploy-cni" tabs:"AWS|DigitalOcean|Docker|Equinix Metal|GCP|Metal3|OpenStack|vSphere,Azure"}}
+{{#tabs name:"tab-deploy-cni" tabs:"AWS|DigitalOcean|Docker|Equinix Metal|GCP|Metal3|Nutanix|OpenStack|vSphere,Azure"}}
 {{#tab AWS|DigitalOcean|Docker|Equinix Metal|GCP|Metal3|OpenStack|vSphere}}
 
 ```bash