diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go index 0753fdc56..51617e075 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -1129,7 +1129,9 @@ func (in *NutanixNodeSpec) DeepCopy() *NutanixNodeSpec { } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *NutanixPrismCentralEndpointCredentials) DeepCopyInto(out *NutanixPrismCentralEndpointCredentials) { +func (in *NutanixPrismCentralEndpointCredentials) DeepCopyInto( + out *NutanixPrismCentralEndpointCredentials, +) { *out = *in out.SecretRef = in.SecretRef } diff --git a/pkg/handlers/nutanix/mutation/machinedetails/inject.go b/pkg/handlers/nutanix/mutation/machinedetails/inject.go index 123fe9359..6ddf049b3 100644 --- a/pkg/handlers/nutanix/mutation/machinedetails/inject.go +++ b/pkg/handlers/nutanix/mutation/machinedetails/inject.go @@ -5,10 +5,10 @@ package machinedetails import ( "context" + "slices" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "k8s.io/utils/ptr" clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1" ctrl "sigs.k8s.io/controller-runtime" @@ -92,41 +92,24 @@ func (h *nutanixMachineDetailsPatchHandler) Mutate( spec := obj.Spec.Template.Spec - spec.BootType = capxv1.NutanixBootType(nutanixMachineDetailsVar.BootType) - spec.Cluster = capxv1.NutanixResourceIdentifier(nutanixMachineDetailsVar.Cluster) - spec.Image = capxv1.NutanixResourceIdentifier(nutanixMachineDetailsVar.Image) + spec.BootType = nutanixMachineDetailsVar.BootType + spec.Cluster = nutanixMachineDetailsVar.Cluster + spec.Image = nutanixMachineDetailsVar.Image spec.VCPUSockets = nutanixMachineDetailsVar.VCPUSockets spec.VCPUsPerSocket = nutanixMachineDetailsVar.VCPUsPerSocket spec.MemorySize = nutanixMachineDetailsVar.MemorySize spec.SystemDiskSize = nutanixMachineDetailsVar.SystemDiskSize - spec.Subnets = make( - []capxv1.NutanixResourceIdentifier, - len(nutanixMachineDetailsVar.Subnets), - ) - for i, subnet := range nutanixMachineDetailsVar.Subnets { - spec.Subnets[i] = capxv1.NutanixResourceIdentifier(subnet) - } + spec.Subnets = slices.Clone(nutanixMachineDetailsVar.Subnets) - spec.AdditionalCategories = make( - []capxv1.NutanixCategoryIdentifier, - len(nutanixMachineDetailsVar.AdditionalCategories), - ) - for i, category := range nutanixMachineDetailsVar.AdditionalCategories { - spec.AdditionalCategories[i] = capxv1.NutanixCategoryIdentifier(category) - } + spec.AdditionalCategories = slices.Clone(nutanixMachineDetailsVar.AdditionalCategories) if nutanixMachineDetailsVar.Project != nil { - spec.Project = ptr.To( - capxv1.NutanixResourceIdentifier(*nutanixMachineDetailsVar.Project), - ) + spec.Project = nutanixMachineDetailsVar.Project } - spec.GPUs = make( - []capxv1.NutanixGPU, - len(nutanixMachineDetailsVar.GPUs), - ) - copy(spec.GPUs, nutanixMachineDetailsVar.GPUs) + spec.GPUs = slices.Clone(nutanixMachineDetailsVar.GPUs) + obj.Spec.Template.Spec = spec return nil }, diff --git a/pkg/handlers/nutanix/mutation/machinedetails/variables_test.go b/pkg/handlers/nutanix/mutation/machinedetails/variables_test.go index 6b28c1f99..68efe78f1 100644 --- a/pkg/handlers/nutanix/mutation/machinedetails/variables_test.go +++ b/pkg/handlers/nutanix/mutation/machinedetails/variables_test.go @@ -19,7 +19,7 @@ func TestVariableValidation(t *testing.T) { requiredFields := minimumClusterConfigSpec() withAdditionalCategories := minimumClusterConfigSpec() - //nolint:lll // gofumpt formats is this way + withAdditionalCategories.ControlPlane.Nutanix.MachineDetails.AdditionalCategories = []capxv1.NutanixCategoryIdentifier{ { Key: "fake-key",