Merge pull request kubernetes-sigs#439 from shapeblue/support-routed-networks

Support routed networks

Author: k8s-ci-robot

.github/workflows/go-coverage.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.22
+          go-version: 1.23
       - name: Run go test with coverage
         run: COVER_PROFILE=coverage.txt make test
       - name: Codecov upload

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

@@ -72,6 +72,12 @@ type Network struct {
 	// Cloudstack VPC the network belongs to.
 	// +optional
 	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
+	RoutingMode string `json:"routingMode,omitempty"`
 }
 
 type VPC struct {

api/v1beta2/zz_generated.conversion.go

@@ -68,19 +68,25 @@ type CloudStackIsolatedNetworkStatus struct {
 	// The ID of the lb rule used to assign VMs to the lb.
 	LBRuleID string `json:"loadBalancerRuleID,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"`
 }
 
 func (n *CloudStackIsolatedNetwork) Network() *Network {
 	return &Network{
-		Name:     n.Spec.Name,
-		Type:     "IsolatedNetwork",
-		ID:       n.Spec.ID,
-		Gateway:  n.Spec.Gateway,
-		Netmask:  n.Spec.Netmask,
-		VPC:      n.Spec.VPC,
-		Offering: n.Spec.Offering,
+		Name:        n.Spec.Name,
+		Type:        "IsolatedNetwork",
+		ID:          n.Spec.ID,
+		Gateway:     n.Spec.Gateway,
+		Netmask:     n.Spec.Netmask,
+		VPC:         n.Spec.VPC,
+		Offering:    n.Spec.Offering,
+		RoutingMode: n.Status.RoutingMode,
 	}
 }
 

api/v1beta3/cloudstackfailuredomain_types.go

@@ -432,6 +432,12 @@ spec:
                                 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

@@ -200,6 +200,12 @@ spec:
                           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.