fix: Make WorkstationCluster network/subnetwork required

GoogleCloudPlatform · Sep 30, 2024 · 0a94ca5 · 0a94ca5
1 parent 93278d7
commit 0a94ca5
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 63 deletions.
diff --git a/apis/workstations/v1alpha1/workstationcluster_types.go b/apis/workstations/v1alpha1/workstationcluster_types.go
@@ -56,12 +56,12 @@ type WorkstationClusterSpec struct {
 
 	// Immutable. Reference to the Compute Engine network in which instances associated
 	//  with this workstation cluster will be created.
-	NetworkRef *refs.ComputeNetworkRef `json:"networkRef,omitempty"`
+	NetworkRef refs.ComputeNetworkRef `json:"networkRef"`
 
 	// Immutable. Reference to the Compute Engine subnetwork in which instances
 	//  associated with this workstation cluster will be created. Must be part of
 	//  the subnetwork specified for this workstation cluster.
-	SubnetworkRef *refs.ComputeSubnetworkRef `json:"subnetworkRef,omitempty"`
+	SubnetworkRef refs.ComputeSubnetworkRef `json:"subnetworkRef"`
 
 	// Optional. Configuration for private workstation cluster.
 	PrivateClusterConfig *WorkstationCluster_PrivateClusterConfig `json:"privateClusterConfig,omitempty"`

diff --git a/apis/workstations/v1alpha1/zz_generated.deepcopy.go b/apis/workstations/v1alpha1/zz_generated.deepcopy.go
diff --git a/...o_v1_customresourcedefinition_workstationclusters.workstations.cnrm.cloud.google.com.yaml b/...o_v1_customresourcedefinition_workstationclusters.workstations.cnrm.cloud.google.com.yaml
@@ -240,7 +240,9 @@ spec:
                     type: string
                 type: object
             required:
+            - networkRef
             - projectRef
+            - subnetworkRef
             type: object
           status:
             description: WorkstationClusterStatus defines the config connector machine

diff --git a/pkg/controller/direct/workstations/workstationcluster_mappings.go b/pkg/controller/direct/workstations/workstationcluster_mappings.go
@@ -31,8 +31,8 @@ func WorkstationClusterSpec_ToProto(mapCtx *direct.MapContext, in *krm.Workstati
 		DisplayName:          direct.ValueOf(in.DisplayName),
 		Annotations:          WorkstationClusterAnnotations_ToProto(mapCtx, in.Annotations),
 		Labels:               WorkstationClusterLabels_ToProto(mapCtx, in.Labels),
-		Network:              WorkstationClusterNetworkRef_ToProto(mapCtx, in.NetworkRef),
-		Subnetwork:           WorkstationClusterSubnetworkRef_ToProto(mapCtx, in.SubnetworkRef),
+		Network:              in.NetworkRef.External,
+		Subnetwork:           in.SubnetworkRef.External,
 		PrivateClusterConfig: WorkstationCluster_PrivateClusterConfig_ToProto(mapCtx, in.PrivateClusterConfig),
 	}
 	return out
@@ -60,20 +60,6 @@ func WorkstationClusterLabels_ToProto(mapCtx *direct.MapContext, in []krm.Workst
 	return out
 }
 
-func WorkstationClusterNetworkRef_ToProto(mapCtx *direct.MapContext, in *refs.ComputeNetworkRef) string {
-	if in == nil {
-		return ""
-	}
-	return in.External
-}
-
-func WorkstationClusterSubnetworkRef_ToProto(mapCtx *direct.MapContext, in *refs.ComputeSubnetworkRef) string {
-	if in == nil {
-		return ""
-	}
-	return in.External
-}
-
 func WorkstationCluster_PrivateClusterConfig_ToProto(mapCtx *direct.MapContext, in *krm.WorkstationCluster_PrivateClusterConfig) *pb.WorkstationCluster_PrivateClusterConfig {
 	if in == nil {
 		return nil
@@ -101,11 +87,15 @@ func WorkstationClusterSpec_FromProto(mapCtx *direct.MapContext, in *pb.Workstat
 		return nil
 	}
 	out := &krm.WorkstationClusterSpec{
-		DisplayName:          direct.LazyPtr(in.GetDisplayName()),
-		Annotations:          WorkstationClusterAnnotations_FromProto(mapCtx, in.GetAnnotations()),
-		Labels:               WorkstationClusterLabels_FromProto(mapCtx, in.GetLabels()),
-		NetworkRef:           WorkstationClusterNetworkRef_FromProto(mapCtx, in.GetNetwork()),
-		SubnetworkRef:        WorkstationClusterSubnetworkRef_FromProto(mapCtx, in.GetSubnetwork()),
+		DisplayName: direct.LazyPtr(in.GetDisplayName()),
+		Annotations: WorkstationClusterAnnotations_FromProto(mapCtx, in.GetAnnotations()),
+		Labels:      WorkstationClusterLabels_FromProto(mapCtx, in.GetLabels()),
+		NetworkRef: refs.ComputeNetworkRef{
+			External: in.GetNetwork(),
+		},
+		SubnetworkRef: refs.ComputeSubnetworkRef{
+			External: in.GetSubnetwork(),
+		},
 		PrivateClusterConfig: WorkstationCluster_PrivateClusterConfig_FromProto(mapCtx, in.GetPrivateClusterConfig()),
 	}
 	return out
@@ -139,24 +129,6 @@ func WorkstationClusterLabels_FromProto(mapCtx *direct.MapContext, in map[string
 	return out
 }
 
-func WorkstationClusterNetworkRef_FromProto(mapCtx *direct.MapContext, in string) *refs.ComputeNetworkRef {
-	if in == "" {
-		return nil
-	}
-	return &refs.ComputeNetworkRef{
-		External: in,
-	}
-}
-
-func WorkstationClusterSubnetworkRef_FromProto(mapCtx *direct.MapContext, in string) *refs.ComputeSubnetworkRef {
-	if in == "" {
-		return nil
-	}
-	return &refs.ComputeSubnetworkRef{
-		External: in,
-	}
-}
-
 func WorkstationCluster_PrivateClusterConfig_FromProto(mapCtx *direct.MapContext, in *pb.WorkstationCluster_PrivateClusterConfig) *krm.WorkstationCluster_PrivateClusterConfig {
 	if in == nil {
 		return nil

diff --git a/pkg/controller/direct/workstations/workstationcluster_normalize.go b/pkg/controller/direct/workstations/workstationcluster_normalize.go
@@ -24,20 +24,21 @@ import (
 )
 
 func NormalizeWorkstationCluster(ctx context.Context, kube client.Reader, obj *krm.WorkstationCluster) error {
-	if obj.Spec.NetworkRef != nil {
-		network, err := refs.ResolveComputeNetwork(ctx, kube, obj, obj.Spec.NetworkRef)
-		if err != nil {
-			return err
-		}
-		obj.Spec.NetworkRef.External = network.String()
+	// Resolve network.
+	network, err := refs.ResolveComputeNetwork(ctx, kube, obj, &obj.Spec.NetworkRef)
+	if err != nil {
+		return err
 	}
-	if obj.Spec.SubnetworkRef != nil {
-		subnet, err := refs.ResolveComputeSubnetwork(ctx, kube, obj, obj.Spec.SubnetworkRef)
-		if err != nil {
-			return err
-		}
-		obj.Spec.SubnetworkRef.External = subnet.External
+	obj.Spec.NetworkRef.External = network.String()
+
+	// Resolve subnetwork.
+	subnet, err := refs.ResolveComputeSubnetwork(ctx, kube, obj, &obj.Spec.SubnetworkRef)
+	if err != nil {
+		return err
 	}
+	obj.Spec.SubnetworkRef.External = subnet.External
+
+	// Resolve projects (in private cluster config).
 	if obj.Spec.PrivateClusterConfig != nil && obj.Spec.PrivateClusterConfig.AllowedProjects != nil {
 		var resolvedProjects []refs.ProjectRef
 		for _, projectRef := range obj.Spec.PrivateClusterConfig.AllowedProjects {