Fix crds

ionos-cloud · Aug 28, 2024 · d17bae1 · d17bae1
1 parent ab98aa5
commit d17bae1
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_ionoscloudmachines.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_ionoscloudmachines.yaml
@@ -69,6 +69,12 @@ spec:
                 items:
                   description: Network contains the config for additional LANs.
                   properties:
+                    dhcp:
+                      default: true
+                      description: |-
+                        DHCP indicates whether DHCP is enabled for the LAN.
+                        The primary NIC will always have DHCP enabled.
+                      type: boolean
                     ipv4PoolRef:
                       description: |-
                         IPv4PoolRef is a reference to an IPAMConfig Pool resource, which exposes IPv4 addresses.
@@ -127,12 +133,6 @@ spec:
                         rule: self.kind == 'InClusterIPPool' || self.kind == 'GlobalInClusterIPPool'
                       - message: ipv6PoolRef.name is required
                         rule: self.name != ''
-                    dhcp:
-                      default: true
-                      description: |-
-                        DHCP indicates whether DHCP is enabled for the LAN.
-                        The primary NIC will always have DHCP enabled.
-                      type: boolean
                     networkID:
                       description: |-
                         NetworkID represents an ID an existing LAN in the data center.

diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_ionoscloudmachinetemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_ionoscloudmachinetemplates.yaml
@@ -79,6 +79,12 @@ spec:
                           description: Network contains the config for additional
                             LANs.
                           properties:
+                            dhcp:
+                              default: true
+                              description: |-
+                                DHCP indicates whether DHCP is enabled for the LAN.
+                                The primary NIC will always have DHCP enabled.
+                              type: boolean
                             ipv4PoolRef:
                               description: |-
                                 IPv4PoolRef is a reference to an IPAMConfig Pool resource, which exposes IPv4 addresses.
@@ -147,12 +153,6 @@ spec:
                                   == 'GlobalInClusterIPPool'
                               - message: ipv6PoolRef.name is required
                                 rule: self.name != ''
-                            dhcp:
-                              default: true
-                              description: |-
-                                DHCP indicates whether DHCP is enabled for the LAN.
-                                The primary NIC will always have DHCP enabled.
-                              type: boolean
                             networkID:
                               description: |-
                                 NetworkID represents an ID an existing LAN in the data center.

diff --git a/internal/service/cloud/server.go b/internal/service/cloud/server.go
@@ -442,10 +442,10 @@ func (s *Service) buildServerEntities(ms *scope.Machine, params serverEntityPara
 	for i, nw := range ms.IonosMachine.Spec.AdditionalNetworks {
 		nic := sdk.Nic{
 			Properties: &sdk.NicProperties{
-				Lan: &nw.NetworkID,
-			Vnet: nw.VNET,
-			Dhcp: nw.DHCP,
-		},
+				Lan:  &nw.NetworkID,
+				Vnet: nw.VNET,
+				Dhcp: nw.DHCP,
+			},
 		}
 
 		if ms.IonosMachine.Status.MachineNetworkInfo != nil {

diff --git a/test/e2e/capic_test.go b/test/e2e/capic_test.go
@@ -111,7 +111,7 @@ var _ = Describe("Should be able to create a cluster with 1 control-plane using
 			ArtifactFolder:           artifactFolder,
 			SkipCleanup:              skipCleanup,
 			PostNamespaceCreated:     cloudEnv.createCredentialsSecretPNC,
-			PostMachinesProvisioned: func(managementClusterProxy framework.ClusterProxy, namespace, clusterName string) {
+			PostMachinesProvisioned: func(managementClusterProxy framework.ClusterProxy, namespace, _ string) {
 				machines := &infrav1.IonosCloudMachineList{}
 				Expect(managementClusterProxy.GetClient().List(ctx, machines, runtimeclient.InNamespace(namespace))).NotTo(HaveOccurred())
 				nic := machines.Items[0].Status.MachineNetworkInfo.NICInfo[0]