fix

Author: Nutrymaco

apis/v1beta1/vspherefailuredomain_types.go

@@ -85,8 +85,8 @@ type Topology struct {
 	// NetworkConfigurations is a list of network configurations within this failure domain.
 	// +optional
 	// +listType=map
-	// +listMapKey=name
-	NetworkConfigurations []NetworkConfiguration `json:"networkConfigs,omitempty"`
+	// +listMapKey=networkName
+	NetworkConfigurations []NetworkConfiguration `json:"networkConfigurations,omitempty"`
 
 	// Datastore is the name or inventory path of the datastore in which the
 	// virtual machine is created/located.
@@ -99,7 +99,7 @@ type Topology struct {
 type NetworkConfiguration struct {
 	// NetworkName is the network name for this machine's VM.
 	// +kubebuilder:validation:Required
-	NetworkName string `json:"name"`
+	NetworkName string `json:"networkName"`
 
 	// DHCP4 is a flag that indicates whether or not to use DHCP for IPv4.
 	// +optional

config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspherefailuredomains.yaml

@@ -365,7 +365,7 @@ spec:
                     - hostGroupName
                     - vmGroupName
                     type: object
-                  networkConfigs:
+                  networkConfigurations:
                     description: NetworkConfigurations is a list of network configurations
                       within this failure domain.
                     items:
@@ -523,10 +523,6 @@ spec:
                                 in the routing table.
                               type: string
                           type: object
-                        name:
-                          description: NetworkName is the network name for this machine's
-                            VM.
-                          type: string
                         nameservers:
                           description: |-
                             Nameservers is a list of IPv4 and/or IPv6 addresses used as DNS
@@ -535,6 +531,10 @@ spec:
                           items:
                             type: string
                           type: array
+                        networkName:
+                          description: NetworkName is the network name for this machine's
+                            VM.
+                          type: string
                         searchDomains:
                           description: |-
                             SearchDomains is a list of search domains used when resolving IP
@@ -543,11 +543,11 @@ spec:
                             type: string
                           type: array
                       required:
-                      - name
+                      - networkName
                       type: object
                     type: array
                     x-kubernetes-list-map-keys:
-                    - name
+                    - networkName
                     x-kubernetes-list-type: map
                   networks:
                     description: Networks is the list of networks within this failure

internal/webhooks/vspherefailuredomain.go

@@ -78,12 +78,12 @@ func (webhook *VSphereFailureDomainWebhook) ValidateCreate(_ context.Context, ra
 	}
 
 	if len(obj.Spec.Topology.NetworkConfigurations) != 0 && len(obj.Spec.Topology.Networks) != 0 {
-		allErrs = append(allErrs, field.Forbidden(field.NewPath("spec", "topology", "networks"), "cannot be set if spec.topology.networkConfigs is already set"))
+		allErrs = append(allErrs, field.Forbidden(field.NewPath("spec", "topology", "networks"), "cannot be set if spec.topology.networkConfigurations is already set"))
 	}
 
 	for i, networkConfig := range obj.Spec.Topology.NetworkConfigurations {
 		if networkConfig.NetworkName == "" {
-			allErrs = append(allErrs, field.Forbidden(field.NewPath("spec", "topology", "networkConfigurations", fmt.Sprint(i), "name"), "cannot be empty"))
+			allErrs = append(allErrs, field.Required(field.NewPath("spec", "topology", "networkConfigurations").Index(i).Child("networkName"), "cannot be empty"))
 		}
 	}
 

pkg/services/vimmachine.go

@@ -29,7 +29,6 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	kerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/klog/v2"
-	"k8s.io/utils/integer"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	clusterutilv1 "sigs.k8s.io/cluster-api/util"
 	"sigs.k8s.io/cluster-api/util/conditions"
@@ -453,7 +452,7 @@ func (v *VimMachineService) generateOverrideFunc(ctx context.Context, vimMachine
 func overrideNetworkDeviceSpecs[T any](deviceSpecs []infrav1.NetworkDeviceSpec, networks []T, mergeFunc func(device *infrav1.NetworkDeviceSpec, network T)) []infrav1.NetworkDeviceSpec {
 	index, length := 0, len(networks)
 
-	devices := make([]infrav1.NetworkDeviceSpec, 0, integer.IntMax(length, len(deviceSpecs)))
+	devices := make([]infrav1.NetworkDeviceSpec, 0, max(length, len(deviceSpecs)))
 	// override the networks on the VM spec with placement constraint network definitions
 	for i := range deviceSpecs {
 		vmNetworkDeviceSpec := deviceSpecs[i]
@@ -478,9 +477,6 @@ func mergeFailureDomainNetworkName(device *infrav1.NetworkDeviceSpec, network st
 }
 
 func mergeNetworkConfigurationInNetworkDeviceSpec(device *infrav1.NetworkDeviceSpec, nc infrav1.NetworkConfiguration) {
-	if device == nil {
-		return
-	}
 	if nc.NetworkName != "" {
 		device.NetworkName = nc.NetworkName
 	}

pkg/services/vimmachine_test.go

@@ -72,7 +72,6 @@ func Test_VimMachineService_GenerateOverrideFunc(t *testing.T) {
 				Topology: infrav1.Topology{
 					Datacenter: fmt.Sprintf("dc-%s", suffix),
 					Datastore:  fmt.Sprintf("ds-%s", suffix),
-					Networks:   []string{fmt.Sprintf("nw-%s", suffix), "another-nw"},
 					NetworkConfigurations: []infrav1.NetworkConfiguration{
 						{
 							NetworkName: fmt.Sprintf("nw-%s", suffix),
@@ -316,18 +315,7 @@ func Test_VimMachineService_GenerateOverrideFunc(t *testing.T) {
 }
 
 func Test_mergeNetworkConfigurationToNetworkDeviceSpec(t *testing.T) {
-	t.Run("device is nil", func(t *testing.T) {
-		g := NewWithT(t)
-
-		var device *infrav1.NetworkDeviceSpec
-		mergeNetworkConfigurationInNetworkDeviceSpec(device, infrav1.NetworkConfiguration{
-			NetworkName: "ignored",
-		})
-
-		g.Expect(device).To(BeNil())
-	})
-
-	t.Run("all fields from NetworkConfiguration are overrided", func(t *testing.T) {
+	t.Run("all fields from NetworkConfiguration are overridden", func(t *testing.T) {
 		g := NewWithT(t)
 
 		device := infrav1.NetworkDeviceSpec{}