Fix conversion errors

Author: vishesh92

Makefile

@@ -129,8 +129,8 @@ lint: $(GOLANGCI_LINT) $(STATIC_CHECK) generate-mocks ## Run linting for the pro
 
 .PHONY: modules
 modules: ## Runs go mod to ensure proper vendoring.
-	go mod tidy -compat=1.22
-	cd $(TOOLS_DIR); go mod tidy -compat=1.22
+	go mod tidy -compat=1.23
+	cd $(TOOLS_DIR); go mod tidy -compat=1.23
 
 .PHONY: generate-all
 generate-all: generate-mocks generate-deepcopy generate-manifests

api/v1beta1/conversion.go

@@ -185,3 +185,14 @@ func Convert_v1beta3_Network_To_v1beta1_Network(in *v1beta3.Network, out *Networ
 	// Skip Gateway, Netmask, and VPC fields as they do not exist in v1beta1.Network
 	return nil
 }
+
+// Convert_v1beta3_CloudStackIsolatedNetworkStatus_To_v1beta1_CloudStackIsolatedNetworkStatus handles manual conversion of CloudStackIsolatedNetworkStatus from v1beta3 to v1beta1
+//
+//nolint:golint,revive,stylecheck
+func Convert_v1beta3_CloudStackIsolatedNetworkStatus_To_v1beta1_CloudStackIsolatedNetworkStatus(in *v1beta3.CloudStackIsolatedNetworkStatus, out *CloudStackIsolatedNetworkStatus, _ conv.Scope) error {
+	out.PublicIPID = in.PublicIPID
+	out.LBRuleID = in.LBRuleID
+	out.Ready = in.Ready
+	// RoutingMode field doesn't exist in v1beta1, so we ignore it during conversion
+	return nil
+}

api/v1beta1/zz_generated.conversion.go

@@ -43,3 +43,14 @@ func Convert_v1beta3_CloudStackIsolatedNetworkSpec_To_v1beta2_CloudStackIsolated
 	// Skip Gateway, Netmask, and VPC fields as they do not exist in v1beta2.CloudStackIsolatedNetworkSpec
 	return nil
 }
+
+// Convert_v1beta3_CloudStackIsolatedNetworkStatus_To_v1beta2_CloudStackIsolatedNetworkStatus handles manual conversion of CloudStackIsolatedNetworkStatus from v1beta3 to v1beta2
+//
+//nolint:golint,revive,stylecheck
+func Convert_v1beta3_CloudStackIsolatedNetworkStatus_To_v1beta2_CloudStackIsolatedNetworkStatus(in *v1beta3.CloudStackIsolatedNetworkStatus, out *CloudStackIsolatedNetworkStatus, _ conv.Scope) error {
+	out.PublicIPID = in.PublicIPID
+	out.LBRuleID = in.LBRuleID
+	out.Ready = in.Ready
+	// RoutingMode field doesn't exist in v1beta2, so we ignore it during conversion
+	return nil
+}

api/v1beta2/conversion.go

@@ -74,8 +74,10 @@ type Network struct {
 	VPC *VPC `json:"vpc,omitempty"`
 
 	// Cloudstack Network's routing mode.
+	// Routing mode can be Dynamic, or Static.
+	// Empty value means the network mode is NATTED, not ROUTED.
 	// +optional
-	NetworkMode string `json:"networkMode,omitempty"`
+	RoutingMode string `json:"routingMode,omitempty"`
 }
 
 type VPC struct {

api/v1beta2/zz_generated.conversion.go

@@ -68,8 +68,10 @@ type CloudStackIsolatedNetworkStatus struct {
 	// The ID of the lb rule used to assign VMs to the lb.
 	LBRuleID string `json:"loadBalancerRuleID,omitempty"`
 
-	// Network mode of the network.
-	NetworkMode string `json:"networkMode,omitempty"`
+	// Routing mode of the network.
+	// Routing mode can be Dynamic, or Static.
+	// Empty value means the network mode is NATTED, not ROUTED.
+	RoutingMode string `json:"routingMode,omitempty"`
 
 	// Ready indicates the readiness of this provider resource.
 	Ready bool `json:"ready"`
@@ -84,7 +86,7 @@ func (n *CloudStackIsolatedNetwork) Network() *Network {
 		Netmask:     n.Spec.Netmask,
 		VPC:         n.Spec.VPC,
 		Offering:    n.Spec.Offering,
-		NetworkMode: n.Status.NetworkMode,
+		RoutingMode: n.Status.RoutingMode,
 	}
 }
 

api/v1beta3/cloudstackfailuredomain_types.go

@@ -425,16 +425,19 @@ spec:
                               description: Cloudstack Network Netmask the cluster
                                 is built in.
                               type: string
-                            networkMode:
-                              description: Cloudstack Network's routing mode.
-                              type: string
                             offering:
                               description: |-
                                 Cloudstack Network Offering the cluster is built in.
                                 Default is "DefaultIsolatedNetworkOfferingWithSourceNatService" for
                                 isolated networks and "DefaultIsolatedNetworkOfferingForVpcNetworks"
                                 for VPC networks.
                               type: string
+                            routingMode:
+                              description: |-
+                                Cloudstack Network's routing mode.
+                                Routing mode can be Dynamic, or Static.
+                                Empty value means the network mode is NATTED, not ROUTED.
+                              type: string
                             type:
                               description: Cloudstack Network Type the cluster is
                                 built in.

api/v1beta3/cloudstackisolatednetwork_types.go

@@ -193,16 +193,19 @@ spec:
                         description: Cloudstack Network Netmask the cluster is built
                           in.
                         type: string
-                      networkMode:
-                        description: Cloudstack Network's routing mode.
-                        type: string
                       offering:
                         description: |-
                           Cloudstack Network Offering the cluster is built in.
                           Default is "DefaultIsolatedNetworkOfferingWithSourceNatService" for
                           isolated networks and "DefaultIsolatedNetworkOfferingForVpcNetworks"
                           for VPC networks.
                         type: string
+                      routingMode:
+                        description: |-
+                          Cloudstack Network's routing mode.
+                          Routing mode can be Dynamic, or Static.
+                          Empty value means the network mode is NATTED, not ROUTED.
+                        type: string
                       type:
                         description: Cloudstack Network Type the cluster is built
                           in.

config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackclusters.yaml

@@ -254,15 +254,18 @@ spec:
               loadBalancerRuleID:
                 description: The ID of the lb rule used to assign VMs to the lb.
                 type: string
-              networkMode:
-                description: Network mode of the network.
-                type: string
               publicIPID:
                 description: The CS public IP ID to use for the k8s endpoint.
                 type: string
               ready:
                 description: Ready indicates the readiness of this provider resource.
                 type: boolean
+              routingMode:
+                description: |-
+                  Routing mode of the network.
+                  Routing mode can be Dynamic, or Static.
+                  Empty value means the network mode is NATTED, not ROUTED.
+                type: string
             required:
             - ready
             type: object

config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackfailuredomains.yaml

@@ -299,7 +299,7 @@ func (r *CloudStackMachineReconciliationRunner) AddToLBIfNeeded() (retRes ctrl.R
 			return r.RequeueWithMessage("Could not get required Isolated Network for VM, requeueing.")
 		}
 
-		if r.IsoNet.Status.NetworkMode == "" {
+		if r.IsoNet.Status.RoutingMode == "" {
 			// For non-routed networks, use load balancer
 			r.Log.Info("Assigning VM to load balancer rule.")
 			err := r.CSUser.AssignVMToLoadBalancerRule(r.IsoNet, *r.ReconciliationSubject.Spec.InstanceID)