Skip to content
This repository was archived by the owner on Apr 11, 2024. It is now read-only.

Commit c00bb82

Browse files
deepakm-ntnxdeepakm-ntnx
committed
incorporated review comments
1 parent 3290426 commit c00bb82

File tree

6 files changed

+29
-28
lines changed

6 files changed

+29
-28
lines changed

‎api/v1alpha1/nutanix_node_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ func (NutanixMachineDetails) VariableSchema() clusterv1.VariableSchema {
133133
"image": NutanixResourceIdentifier{}.VariableSchema().OpenAPIV3Schema,
134134
"cluster": NutanixResourceIdentifier{}.VariableSchema().OpenAPIV3Schema,
135135
"subnet": NutanixResourceIdentifiers{}.VariableSchema().OpenAPIV3Schema,
136-
"bootType": NutanixBootType("legacy").VariableSchema().OpenAPIV3Schema,
136+
"bootType": NutanixBootType(NutanixBootTypeLegacy).VariableSchema().OpenAPIV3Schema,
137137
"systemDiskSize": {
138138
Description: "systemDiskSize is size (in Quantity format) of the system disk of the VM eg. 20Gi",
139139
Type: "string",

‎api/v1alpha1/zz_generated.deepcopy.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -129,23 +129,23 @@ func (h *nutanixMachineDetailsControlPlanePatchHandler) Mutate(
129129
)
130130

131131
obj.Spec.Template.Spec.Subnets = make([]capxv1.NutanixResourceIdentifier, 0)
132-
for _, subnetCRE := range nutanixMachineDetailsVar.Subnets {
133-
if subnetCRE.Type == "" {
132+
for _, subnetIdentifier := range nutanixMachineDetailsVar.Subnets {
133+
if subnetIdentifier.Type == "" {
134134
continue
135135
}
136136
subnet := capxv1.NutanixResourceIdentifier{}
137-
if subnetCRE.Type == v1alpha1.NutanixIdentifierName {
137+
if subnetIdentifier.Type == v1alpha1.NutanixIdentifierName {
138138
subnet.Type = capxv1.NutanixIdentifierName
139-
if subnetCRE.Name == nil || *subnetCRE.Name == "" {
139+
if subnetIdentifier.Name == nil || *subnetIdentifier.Name == "" {
140140
continue
141141
}
142-
subnet.Name = subnetCRE.Name
142+
subnet.Name = subnetIdentifier.Name
143143
} else {
144144
subnet.Type = capxv1.NutanixIdentifierUUID
145-
if subnetCRE.UUID == nil || *subnetCRE.UUID == "" {
145+
if subnetIdentifier.UUID == nil || *subnetIdentifier.UUID == "" {
146146
continue
147147
}
148-
subnet.UUID = subnetCRE.UUID
148+
subnet.UUID = subnetIdentifier.UUID
149149
}
150150
obj.Spec.Template.Spec.Subnets = append(obj.Spec.Template.Spec.Subnets, subnet)
151151
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -122,23 +122,23 @@ func (h *nutanixMachineDetailsWorkerPatchHandler) Mutate(
122122
nutanixMachineDetailsVar.SystemDiskSize,
123123
)
124124
obj.Spec.Template.Spec.Subnets = make([]capxv1.NutanixResourceIdentifier, 0)
125-
for _, subnetCRE := range nutanixMachineDetailsVar.Subnets {
126-
if subnetCRE.Type == "" {
125+
for _, subnetIdentifier := range nutanixMachineDetailsVar.Subnets {
126+
if subnetIdentifier.Type == "" {
127127
continue
128128
}
129129
subnet := capxv1.NutanixResourceIdentifier{}
130-
if subnetCRE.Type == v1alpha1.NutanixIdentifierName {
130+
if subnetIdentifier.Type == v1alpha1.NutanixIdentifierName {
131131
subnet.Type = capxv1.NutanixIdentifierName
132-
if subnetCRE.Name == nil || *subnetCRE.Name == "" {
132+
if subnetIdentifier.Name == nil || *subnetIdentifier.Name == "" {
133133
continue
134134
}
135-
subnet.Name = subnetCRE.Name
135+
subnet.Name = subnetIdentifier.Name
136136
} else {
137137
subnet.Type = capxv1.NutanixIdentifierUUID
138-
if subnetCRE.UUID == nil || *subnetCRE.UUID == "" {
138+
if subnetIdentifier.UUID == nil || *subnetIdentifier.UUID == "" {
139139
continue
140140
}
141-
subnet.UUID = subnetCRE.UUID
141+
subnet.UUID = subnetIdentifier.UUID
142142
}
143143
obj.Spec.Template.Spec.Subnets = append(obj.Spec.Template.Spec.Subnets, subnet)
144144
}

‎pkg/handlers/nutanix/mutation/machinedetails/variables_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func TestVariableValidation(t *testing.T) {
3030
ControlPlane: &v1alpha1.NodeConfigSpec{
3131
Nutanix: &v1alpha1.NutanixNodeSpec{
3232
MachineDetails: &v1alpha1.NutanixMachineDetails{
33-
BootType: "legacy",
33+
BootType: v1alpha1.NutanixBootTypeLegacy,
3434
VCPUSockets: 2,
3535
VCPUsPerSocket: 1,
3636
Image: v1alpha1.NutanixResourceIdentifier{

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

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -94,17 +94,18 @@ func (h *nutanixPrismCentralEndpoint) Mutate(
9494
"patchedObjectName", client.ObjectKeyFromObject(obj),
9595
).Info("setting prismCentralEndpoint in NutanixCluster spec")
9696

97-
obj.Spec.Template.Spec.PrismCentral = &credentials.NutanixPrismEndpoint{}
98-
obj.Spec.Template.Spec.PrismCentral.Address = prismCentralEndpointVar.Host
99-
obj.Spec.Template.Spec.PrismCentral.Port = prismCentralEndpointVar.Port
100-
obj.Spec.Template.Spec.PrismCentral.Insecure = prismCentralEndpointVar.Insecure
101-
obj.Spec.Template.Spec.PrismCentral.AdditionalTrustBundle = &credentials.NutanixTrustBundleReference{
102-
Kind: credentials.NutanixTrustBundleKindConfigMap,
103-
Name: prismCentralEndpointVar.AdditionalTrustBundle,
104-
}
105-
obj.Spec.Template.Spec.PrismCentral.CredentialRef = &credentials.NutanixCredentialReference{
106-
Kind: credentials.SecretKind,
107-
Name: prismCentralEndpointVar.CredentialSecret,
97+
obj.Spec.Template.Spec.PrismCentral = &credentials.NutanixPrismEndpoint{
98+
Address: prismCentralEndpointVar.Host,
99+
Port: prismCentralEndpointVar.Port,
100+
Insecure: prismCentralEndpointVar.Insecure,
101+
AdditionalTrustBundle: &credentials.NutanixTrustBundleReference{
102+
Kind: credentials.NutanixTrustBundleKindConfigMap,
103+
Name: prismCentralEndpointVar.AdditionalTrustBundle,
104+
},
105+
CredentialRef: &credentials.NutanixCredentialReference{
106+
Kind: credentials.SecretKind,
107+
Name: prismCentralEndpointVar.CredentialSecret,
108+
},
108109
}
109110

110111
return nil

0 commit comments

Comments
 (0)