added template modifications for uuid in machineconfig

aws · Dec 5, 2022 · f5e9e44 · f5e9e44
1 parent ac8d541
commit f5e9e44
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/pkg/providers/nutanix/config/md-template.yaml b/pkg/providers/nutanix/config/md-template.yaml
@@ -41,14 +41,29 @@ spec:
       memorySize: {{.memorySize}}
       systemDiskSize: {{.systemDiskSize}}
       image:
+{{- if and .imageIDType (eq .format "name") }}
         type: name
         name: "{{.imageName}}"
+{{ else if and .imageIDType (eq .format "uuid") }}
+        type: uuid
+        name: "{{.imageUUID}}"
+{{ end }}
       cluster:
+{{- if and .nutanixPEClusterIDType (eq .format "name") }}
         type: name
         name: "{{.nutanixPEClusterName}}"
+{{- else if and .nutanixPEClusterIDType (eq .format "uuid") }}
+        type: uuid
+        name: "{{.nutanixPEClusterUUID}}"
+{{ end }}
       subnet:
+{{- if and .subnetIDType (eq .format "name") }}
         - type: name
           name: "{{.subnetName}}"
+{{- else if and .subnetIDType (eq .format "uuid") }}
+        - type: uuid
+          name: "{{.subnetUUID}}"
+{{ end }}
 ---
 apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
 kind: KubeadmConfigTemplate

diff --git a/pkg/providers/nutanix/template.go b/pkg/providers/nutanix/template.go
@@ -154,9 +154,15 @@ func buildTemplateMapCP(
 		"vcpuSockets":                  controlPlaneMachineSpec.VCPUSockets,
 		"memorySize":                   controlPlaneMachineSpec.MemorySize.String(),
 		"systemDiskSize":               controlPlaneMachineSpec.SystemDiskSize.String(),
-		"imageName":                    controlPlaneMachineSpec.Image.Name,   // TODO(nutanix): pass name or uuid based on type of identifier
-		"nutanixPEClusterName":         controlPlaneMachineSpec.Cluster.Name, // TODO(nutanix): pass name or uuid based on type of identifier
-		"subnetName":                   controlPlaneMachineSpec.Subnet.Name,  // TODO(nutanix): pass name or uuid based on type of identifier
+		"imageIDType":                  controlPlaneMachineSpec.Image.Type,
+		"imageName":                    controlPlaneMachineSpec.Image.Name,
+		"imageUUID":                    controlPlaneMachineSpec.Image.UUID,
+		"nutanixPEClusterIDType":       controlPlaneMachineSpec.Cluster.Type,
+		"nutanixPEClusterName":         controlPlaneMachineSpec.Cluster.Name,
+		"nutanixPEClusterUUID":         controlPlaneMachineSpec.Cluster.UUID,
+		"subnetIDType":                 controlPlaneMachineSpec.Subnet.Type,
+		"subnetName":                   controlPlaneMachineSpec.Subnet.Name,
+		"subnetUUID":                   controlPlaneMachineSpec.Subnet.UUID,
 	}
 
 	if clusterSpec.Cluster.Spec.ExternalEtcdConfiguration != nil {