now added subnet settings in cre

Author: deepakm-ntnx

api/v1alpha1/nutanix_clusterconfig_types.go

@@ -28,10 +28,11 @@ func (NutanixSpec) VariableSchema() clusterv1.VariableSchema {
 }
 
 type NutanixPrismCentralEndpointSpec struct {
-	Host                  string `json:"host,omitempty"`
-	Port                  int32  `json:"port,omitempty"`
-	Insecure              bool   `json:"insecure,omitempty"`
+	Host                  string `json:"host"`
+	Port                  int32  `json:"port"`
+	Insecure              bool   `json:"insecure"`
 	AdditionalTrustBundle string `json:"additionalTrustBundle,omitempty"`
+	CredentialSecret      string `json:"credentialSecret"`
 }
 
 func (NutanixPrismCentralEndpointSpec) VariableSchema() clusterv1.VariableSchema {
@@ -53,7 +54,11 @@ func (NutanixPrismCentralEndpointSpec) VariableSchema() clusterv1.VariableSchema
 					Type:        "boolean",
 				},
 				"additionalTrustBundle": {
-					Description: "Certificate trust bundle used for Prism Central connection",
+					Description: "Name of configMap with certificate trust bundle used for Prism Central connection",
+					Type:        "string",
+				},
+				"credentialSecret": {
+					Description: "Name of a Credential information secret for the target Prism instance",
 					Type:        "string",
 				},
 			},

examples/capi-quick-start/nutanix-cluster-calico-crs.yaml

@@ -335,7 +335,7 @@ spec:
             host: ${CONTROL_PLANE_ENDPOINT_IP}
             port: ${CONTROL_PLANE_ENDPOINT_PORT}
           prismCentralEndpoint:
-            additionalTrustBundle: trust-bundle-root-ca
+            additionalTrustBundle: ${CLUSTER_NAME}-pc-trusted-ca-bundle
             credentialSecret: ${CLUSTER_NAME}-pc-creds
             host: ${NUTANIX_ENDPOINT}
             insecure: ${NUTANIX_INSECURE}

examples/capi-quick-start/nutanix-cluster-calico-helm-addon.yaml

@@ -335,7 +335,7 @@ spec:
             host: ${CONTROL_PLANE_ENDPOINT_IP}
             port: ${CONTROL_PLANE_ENDPOINT_PORT}
           prismCentralEndpoint:
-            additionalTrustBundle: trust-bundle-root-ca
+            additionalTrustBundle: ${CLUSTER_NAME}-pc-trusted-ca-bundle
             credentialSecret: ${CLUSTER_NAME}-pc-creds
             host: ${NUTANIX_ENDPOINT}
             insecure: ${NUTANIX_INSECURE}

examples/capi-quick-start/nutanix-cluster-cilium-crs.yaml

@@ -335,7 +335,7 @@ spec:
             host: ${CONTROL_PLANE_ENDPOINT_IP}
             port: ${CONTROL_PLANE_ENDPOINT_PORT}
           prismCentralEndpoint:
-            additionalTrustBundle: trust-bundle-root-ca
+            additionalTrustBundle: ${CLUSTER_NAME}-pc-trusted-ca-bundle
             credentialSecret: ${CLUSTER_NAME}-pc-creds
             host: ${NUTANIX_ENDPOINT}
             insecure: ${NUTANIX_INSECURE}

examples/capi-quick-start/nutanix-cluster-cilium-helm-addon.yaml

@@ -335,7 +335,7 @@ spec:
             host: ${CONTROL_PLANE_ENDPOINT_IP}
             port: ${CONTROL_PLANE_ENDPOINT_PORT}
           prismCentralEndpoint:
-            additionalTrustBundle: trust-bundle-root-ca
+            additionalTrustBundle: ${CLUSTER_NAME}-pc-trusted-ca-bundle
             credentialSecret: ${CLUSTER_NAME}-pc-creds
             host: ${NUTANIX_ENDPOINT}
             insecure: ${NUTANIX_INSECURE}

hack/examples/base/nutanix/cluster-topology/kustomization.yaml.tmpl

@@ -59,7 +59,7 @@ patches:
                   host: $${CONTROL_PLANE_ENDPOINT_IP}
                   port: $${CONTROL_PLANE_ENDPOINT_PORT}
                 prismCentralEndpoint:
-                  additionalTrustBundle: trust-bundle-root-ca
+                  additionalTrustBundle: $${CLUSTER_NAME}-pc-trusted-ca-bundle
                   host: $${NUTANIX_ENDPOINT}
                   insecure: $${NUTANIX_INSECURE}
                   port: 9440

pkg/handlers/nutanix/mutation/machinedetails/inject_control_plane.go

@@ -127,8 +127,20 @@ func (h *nutanixMachineDetailsControlPlanePatchHandler) Mutate(
 			obj.Spec.Template.Spec.SystemDiskSize = resource.MustParse(
 				nutanixMachineDetailsVar.SystemDiskSize,
 			)
+
+			subnets := make([]capxv1.NutanixResourceIdentifier, len(nutanixMachineDetailsVar.Subnets))
+			for _, subnetCRE := range nutanixMachineDetailsVar.Subnets {
+				subnet := capxv1.NutanixResourceIdentifier{Type: capxv1.NutanixIdentifierType(subnetCRE.Type)}
+				if subnetCRE.Type == v1alpha1.NutanixIdentifierName {
+					subnet.Name = subnetCRE.Name
+				} else {
+					subnet.UUID = subnetCRE.UUID
+				}
+				subnets = append(subnets, subnet)
+			}
+
+			obj.Spec.Template.Spec.Subnets = subnets
 			// TODO
-			// obj.Spec.Template.Spec.Subnets = nutanixMachineDetailsVar.Subnets
 			// obj.Spec.Template.Spec.Project = nutanixMachineDetailsVar.Project
 			// obj.Spec.Template.Spec.AdditionalCategories = nutanixMachineDetailsVar.AdditionalCategories
 			// obj.Spec.Template.Spec.GPUs = nutanixMachineDetailsVar.GPUs

pkg/handlers/nutanix/mutation/machinedetails/inject_worker.go

@@ -121,8 +121,20 @@ func (h *nutanixMachineDetailsWorkerPatchHandler) Mutate(
 			obj.Spec.Template.Spec.SystemDiskSize = resource.MustParse(
 				nutanixMachineDetailsVar.SystemDiskSize,
 			)
+
+			subnets := make([]capxv1.NutanixResourceIdentifier, len(nutanixMachineDetailsVar.Subnets))
+			for _, subnetCRE := range nutanixMachineDetailsVar.Subnets {
+				subnet := capxv1.NutanixResourceIdentifier{Type: capxv1.NutanixIdentifierType(subnetCRE.Type)}
+				if subnetCRE.Type == v1alpha1.NutanixIdentifierName {
+					subnet.Name = subnetCRE.Name
+				} else {
+					subnet.UUID = subnetCRE.UUID
+				}
+				subnets = append(subnets, subnet)
+			}
+
+			obj.Spec.Template.Spec.Subnets = subnets
 			// TODO
-			// obj.Spec.Template.Spec.Subnets = nutanixMachineDetailsVar.Subnets
 			// obj.Spec.Template.Spec.Project = nutanixMachineDetailsVar.Project
 			// obj.Spec.Template.Spec.AdditionalCategories = nutanixMachineDetailsVar.AdditionalCategories
 			// obj.Spec.Template.Spec.GPUs = nutanixMachineDetailsVar.GPUs

pkg/handlers/nutanix/mutation/prismcentralendpoint/inject.go

@@ -18,6 +18,7 @@ import (
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
 	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig"
+	"github.com/nutanix-cloud-native/prism-go-client/environment/credentials"
 )
 
 const (
@@ -96,7 +97,14 @@ func (h *nutanixPrismCentralEndpoint) Mutate(
 			obj.Spec.Template.Spec.PrismCentral.Address = prismCentralEndpointVar.Host
 			obj.Spec.Template.Spec.PrismCentral.Port = prismCentralEndpointVar.Port
 			obj.Spec.Template.Spec.PrismCentral.Insecure = prismCentralEndpointVar.Insecure
-			// TODO obj.Spec.Template.Spec.PrismCentral.AdditionalTrustBundle = prismCentralEndpointVar.AdditionalTrustBundle
+			obj.Spec.Template.Spec.PrismCentral.AdditionalTrustBundle = &credentials.NutanixTrustBundleReference{
+				Kind: credentials.NutanixTrustBundleKindConfigMap,
+				Name: prismCentralEndpointVar.AdditionalTrustBundle,
+			}
+			obj.Spec.Template.Spec.PrismCentral.CredentialRef = &credentials.NutanixCredentialReference{
+				Kind: credentials.SecretKind,
+				Name: prismCentralEndpointVar.CredentialSecret,
+			}
 
 			return nil
 		},