NCN-100421 Added FailureDomains as mutation in caren

Author: deepakm-ntnx

api/external/github.com/nutanix-cloud-native/cluster-api-provider-nutanix/api/v1beta1/nutanixcluster_types.go

@@ -17,9 +17,11 @@ limitations under the License.
 package v1beta1
 
 import (
+	"cmp"
 	"fmt"
 
 	credentialTypes "github.com/nutanix-cloud-native/prism-go-client/environment/credentials"
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	capiv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/errors"
@@ -162,6 +164,12 @@ func (ncl *NutanixCluster) GetPrismCentralCredentialRef() (*credentialTypes.Nuta
 	return prismCentralInfo.CredentialRef, nil
 }
 
+// GetNamespacedName returns the namespaced name of the NutanixCluster.
+func (ncl *NutanixCluster) GetNamespacedName() string {
+	namespace := cmp.Or(ncl.Namespace, corev1.NamespaceDefault)
+	return fmt.Sprintf("%s/%s", namespace, ncl.Name)
+}
+
 // +kubebuilder:object:root=true
 
 // NutanixClusterList contains a list of NutanixCluster

api/external/github.com/nutanix-cloud-native/cluster-api-provider-nutanix/api/v1beta1/nutanixmachine_types.go

@@ -35,6 +35,16 @@ const (
 	// resources associated with NutanixMachine before removing it from the
 	// API Server.
 	NutanixMachineFinalizer = "nutanixmachine.infrastructure.cluster.x-k8s.io"
+
+	// NutanixMachineBootstrapRefKindSecret represents the Kind of Secret
+	// referenced by NutanixMachine's BootstrapRef.
+	NutanixMachineBootstrapRefKindSecret = "Secret"
+
+	// NutanixMachineBootstrapRefKindImage represents the Kind of Image
+	// referenced by NutanixMachine's BootstrapRef. If the BootstrapRef.Kind is set
+	// to Image, the NutanixMachine will be created with the image mounted
+	// as a CD-ROM.
+	NutanixMachineBootstrapRefKindImage = "Image"
 )
 
 // NutanixMachineSpec defines the desired state of NutanixMachine

api/v1alpha1/crds/caren.nutanix.com_nutanixclusterconfigs.yaml

@@ -571,6 +571,93 @@ spec:
                     - host
                     - port
                     type: object
+                  failureDomains:
+                    description: |-
+                      failureDomains configures failure domains information for the Nutanix platform.
+                      When set, the failure domains defined here may be used to spread Machines across
+                      prism element clusters to improve fault tolerance of the cluster.
+                    items:
+                      description: NutanixFailureDomain configures failure domain
+                        information for Nutanix.
+                      properties:
+                        cluster:
+                          description: |-
+                            cluster is to identify the cluster (the Prism Element under management of the Prism Central),
+                            in which the Machine's VM will be created. The cluster identifier (uuid or name) can be obtained
+                            from the Prism Central console or using the prism_central API.
+                          properties:
+                            name:
+                              description: name is the resource name in the PC
+                              type: string
+                            type:
+                              description: Type is the identifier type to use for
+                                this resource.
+                              enum:
+                              - uuid
+                              - name
+                              type: string
+                            uuid:
+                              description: uuid is the UUID of the resource in the
+                                PC.
+                              type: string
+                          required:
+                          - type
+                          type: object
+                        controlPlane:
+                          description: indicates if a failure domain is suited for
+                            control plane nodes
+                          type: boolean
+                        name:
+                          description: |-
+                            name defines the unique name of a failure domain.
+                            Name is required and must be at most 64 characters in length.
+                            It must consist of only lower case alphanumeric characters and hyphens (-).
+                            It must start and end with an alphanumeric character.
+                            This value is arbitrary and is used to identify the failure domain within the platform.
+                          maxLength: 64
+                          minLength: 1
+                          pattern: '[a-z0-9]([-a-z0-9]*[a-z0-9])?'
+                          type: string
+                        subnets:
+                          description: |-
+                            subnets holds a list of identifiers (one or more) of the cluster's network subnets
+                            for the Machine's VM to connect to. The subnet identifiers (uuid or name) can be
+                            obtained from the Prism Central console or using the prism_central API.
+                          items:
+                            description: NutanixResourceIdentifier holds the identity
+                              of a Nutanix PC resource (cluster, image, subnet, etc.)
+                            properties:
+                              name:
+                                description: name is the resource name in the PC
+                                type: string
+                              type:
+                                description: Type is the identifier type to use for
+                                  this resource.
+                                enum:
+                                - uuid
+                                - name
+                                type: string
+                              uuid:
+                                description: uuid is the UUID of the resource in the
+                                  PC.
+                                type: string
+                            required:
+                            - type
+                            type: object
+                          minItems: 1
+                          type: array
+                          x-kubernetes-list-map-keys:
+                          - type
+                          x-kubernetes-list-type: map
+                      required:
+                      - cluster
+                      - name
+                      - subnets
+                      type: object
+                    type: array
+                    x-kubernetes-list-map-keys:
+                    - name
+                    x-kubernetes-list-type: map
                   prismCentralEndpoint:
                     description: Nutanix Prism Central endpoint configuration.
                     properties:

api/v1alpha1/nutanix_clusterconfig_types.go

@@ -23,6 +23,14 @@ type NutanixSpec struct {
 	// Nutanix Prism Central endpoint configuration.
 	// +kubebuilder:validation:Required
 	PrismCentralEndpoint NutanixPrismCentralEndpointSpec `json:"prismCentralEndpoint"`
+
+	// failureDomains configures failure domains information for the Nutanix platform.
+	// When set, the failure domains defined here may be used to spread Machines across
+	// prism element clusters to improve fault tolerance of the cluster.
+	// +listType=map
+	// +listMapKey=name
+	// +kubebuilder:validation:Optional
+	FailureDomains []NutanixFailureDomain `json:"failureDomains,omitempty"`
 }
 
 type NutanixPrismCentralEndpointSpec struct {
@@ -76,3 +84,39 @@ func (s NutanixPrismCentralEndpointSpec) ParseURL() (string, int32, error) {
 
 	return hostname, int32(port), nil
 }
+
+// NutanixFailureDomains is a list of FDs
+type NutanixFailureDomains []NutanixFailureDomain
+
+// NutanixFailureDomain configures failure domain information for Nutanix.
+type NutanixFailureDomain struct {
+	// name defines the unique name of a failure domain.
+	// Name is required and must be at most 64 characters in length.
+	// It must consist of only lower case alphanumeric characters and hyphens (-).
+	// It must start and end with an alphanumeric character.
+	// This value is arbitrary and is used to identify the failure domain within the platform.
+	// +kubebuilder:validation:Required
+	// +kubebuilder:validation:MinLength=1
+	// +kubebuilder:validation:MaxLength=64
+	// +kubebuilder:validation:Pattern=`[a-z0-9]([-a-z0-9]*[a-z0-9])?`
+	Name string `json:"name"`
+
+	// cluster is to identify the cluster (the Prism Element under management of the Prism Central),
+	// in which the Machine's VM will be created. The cluster identifier (uuid or name) can be obtained
+	// from the Prism Central console or using the prism_central API.
+	// +kubebuilder:validation:Required
+	Cluster NutanixResourceIdentifier `json:"cluster"`
+
+	// subnets holds a list of identifiers (one or more) of the cluster's network subnets
+	// for the Machine's VM to connect to. The subnet identifiers (uuid or name) can be
+	// obtained from the Prism Central console or using the prism_central API.
+	// +kubebuilder:validation:Required
+	// +kubebuilder:validation:MinItems=1
+	// +listType=map
+	// +listMapKey=type
+	Subnets []NutanixResourceIdentifier `json:"subnets"`
+
+	// indicates if a failure domain is suited for control plane nodes
+	// +kubebuilder:validation:Required
+	ControlPlane bool `json:"controlPlane,omitempty"`
+}

api/v1alpha1/zz_generated.deepcopy.go

@@ -7,7 +7,7 @@ kind: Kustomization
 resources:
 - ../../../additional-resources/dockerhub-secret.yaml
 - ../../../additional-resources/nutanix/csi-secret.yaml
-- https://github.com/nutanix-cloud-native/cluster-api-provider-nutanix/releases/download/${CAPX_VERSION}/cluster-template-topology.yaml
+- https://raw.githubusercontent.com/nutanix-cloud-native/cluster-api-provider-nutanix/74c5d337fe852b904b628d3d19a74f0949c37b1c/templates/cluster-template-topology.yaml
 
 sortOptions:
   order: fifo

hack/examples/bases/nutanix/cluster/kustomization.yaml.tmpl

@@ -5,7 +5,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-- https://github.com/nutanix-cloud-native/cluster-api-provider-nutanix/releases/download/${CAPX_VERSION}/cluster-template-clusterclass.yaml
+- https://raw.githubusercontent.com/nutanix-cloud-native/cluster-api-provider-nutanix/74c5d337fe852b904b628d3d19a74f0949c37b1c/templates/cluster-template-clusterclass.yaml
 
 configurations:
   - kustomizeconfig.yaml

hack/examples/bases/nutanix/clusterclass/kustomization.yaml.tmpl

@@ -7,7 +7,7 @@ go 1.22.1
 
 toolchain go1.22.2
 
-require github.com/nutanix-cloud-native/cluster-api-provider-nutanix v1.4.0-alpha.2
+require github.com/nutanix-cloud-native/cluster-api-provider-nutanix v1.4.0-alpha.2.0.20240507152352-74c5d337fe85
 
 require (
 	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
@@ -24,7 +24,7 @@ require (
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/nutanix-cloud-native/prism-go-client v0.3.4 // indirect
+	github.com/nutanix-cloud-native/prism-go-client v0.4.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	golang.org/x/net v0.24.0 // indirect
 	golang.org/x/text v0.14.0 // indirect