review fixes

Author: mweibel

.github/workflows/release.yml

@@ -53,8 +53,9 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
+          ls dist/cluster-template*.yaml >/dev/null || { echo "No cluster templates found in dist/"; exit 1; }
           gh release create "$TAG" \
             --generate-notes \
             dist/infrastructure-components.yaml \
             dist/metadata.yaml \
-            dist/cluster-template.yaml
+            dist/cluster-template*.yaml

Makefile

@@ -314,9 +314,9 @@ build-installer: manifests generate kustomize ## Generate a consolidated YAML wi
 	"$(KUSTOMIZE)" build config/default > dist/infrastructure-components.yaml
 
 .PHONY: release-manifests
-release-manifests: build-installer ## Build all release artifacts into dist/ (infrastructure-components.yaml, metadata.yaml, cluster-template.yaml).
+release-manifests: build-installer ## Build all release artifacts into dist/ (infrastructure-components.yaml, metadata.yaml, cluster templates).
 	cp metadata.yaml dist/metadata.yaml
-	cp templates/cluster-template.yaml dist/cluster-template.yaml
+	cp templates/cluster-template*.yaml dist/
 
 ##@ Deployment
 

internal/controller/cloudscalemachine_server.go

@@ -295,8 +295,8 @@ func (r *CloudscaleMachineReconciler) buildInterfaceRequests(machineScope *scope
 		}
 		firstNetwork := machineScope.CloudscaleCluster.Status.Networks[0]
 		return &[]cloudscalesdk.InterfaceRequest{
-			{Network: firstNetwork.NetworkID},
 			{Network: InterfaceTypePublic},
+			{Network: firstNetwork.NetworkID},
 		}, nil, nil
 	}
 

internal/controller/cloudscalemachine_server_test.go

@@ -612,7 +612,7 @@ func TestReconcileServer_NoServerGroupWhenStatusEmpty(t *testing.T) {
 
 // --- buildInterfaceRequests tests ---
 
-func TestBuildInterfaceRequests_DefaultsToFirstNetworkPlusPublic(t *testing.T) {
+func TestBuildInterfaceRequests_DefaultsToPublicPlusFirstNetwork(t *testing.T) {
 	g := NewWithT(t)
 
 	machineScope := newTestMachineScopeWithServer(&mockServerService{})
@@ -625,8 +625,8 @@ func TestBuildInterfaceRequests_DefaultsToFirstNetworkPlusPublic(t *testing.T) {
 	g.Expect(err).ToNot(HaveOccurred())
 	g.Expect(reqs).ToNot(BeNil())
 	g.Expect(*reqs).To(HaveLen(2))
-	g.Expect((*reqs)[0].Network).To(Equal("net-uuid-123"))
-	g.Expect((*reqs)[1].Network).To(Equal(InterfaceTypePublic))
+	g.Expect((*reqs)[0].Network).To(Equal(InterfaceTypePublic))
+	g.Expect((*reqs)[1].Network).To(Equal("net-uuid-123"))
 	g.Expect(ipFamily).To(BeNil(), "runtime default path should not return ipFamily")
 }
 

templates/cluster-template.yaml

@@ -39,7 +39,7 @@ spec:
   region: "${CLOUDSCALE_REGION}"
   networks:
   - name: "${CLUSTER_NAME}"
-    cidr: "10.100.0.0/24"
+    cidr: "10.0.0.0/24"
     gatewayAddress: "" # disable gateway, use public interface for internet access
   credentialsRef:
     name: "${CLUSTER_NAME}-credentials"