ROSAControlPlane to use net info from RosaNetwork CR

Author: mzazrivec

config/crd/bases/controlplane.cluster.x-k8s.io_rosacontrolplanes.yaml

@@ -776,6 +776,22 @@ spec:
                 x-kubernetes-validations:
                 - message: rosaClusterName is immutable
                   rule: self == oldSelf
+              rosaNetworkRef:
+                description: |-
+                  RosaNetworkRef references RosaNetwork custom resource that contains the networking infrastructure
+                  for Rosa HCP cluster
+                properties:
+                  name:
+                    default: ""
+                    description: |-
+                      Name of the referent.
+                      This field is effectively required, but due to backwards compatibility is
+                      allowed to be empty. Instances of this type with an empty value here are
+                      almost certainly wrong.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
               subnets:
                 description: |-
                   The Subnet IDs to use when installing the cluster.
@@ -809,14 +825,12 @@ spec:
                   to worker instances.
                 type: string
             required:
-            - availabilityZones
             - channelGroup
             - installerRoleARN
             - oidcID
             - region
             - rolesRef
             - rosaClusterName
-            - subnets
             - supportRoleARN
             - version
             - versionGate

controlplane/rosa/api/v1beta2/rosacontrolplane_types.go

@@ -95,12 +95,14 @@ type RosaControlPlaneSpec struct { //nolint: maligned
 
 	// The Subnet IDs to use when installing the cluster.
 	// SubnetIDs should come in pairs; two per availability zone, one private and one public.
-	Subnets []string `json:"subnets"`
+	// +optional
+	Subnets []string `json:"subnets,omitempty"`
 
 	// AvailabilityZones describe AWS AvailabilityZones of the worker nodes.
 	// should match the AvailabilityZones of the provided Subnets.
 	// a machinepool will be created for each availabilityZone.
-	AvailabilityZones []string `json:"availabilityZones"`
+	// +optional
+	AvailabilityZones []string `json:"availabilityZones,omitempty"`
 
 	// The AWS Region the cluster lives in.
 	Region string `json:"region"`
@@ -231,6 +233,11 @@ type RosaControlPlaneSpec struct { //nolint: maligned
 	// ClusterRegistryConfig represents registry config used with the cluster.
 	// +optional
 	ClusterRegistryConfig *RegistryConfig `json:"clusterRegistryConfig,omitempty"`
+
+	// RosaNetworkRef references RosaNetwork custom resource that contains the networking infrastructure
+	// for Rosa HCP cluster
+	// +optional
+	RosaNetworkRef *corev1.LocalObjectReference `json:"rosaNetworkRef,omitempty"`
 }
 
 // RegistryConfig for ROSA-HCP cluster

controlplane/rosa/api/v1beta2/zz_generated.deepcopy.go

@@ -313,7 +313,27 @@ func (r *ROSAControlPlaneReconciler) reconcileNormal(ctx context.Context, rosaSc
 		return ctrl.Result{RequeueAfter: time.Second * 60}, nil
 	}
 
-	ocmClusterSpec, err := buildOCMClusterSpec(rosaScope.ControlPlane.Spec, creator)
+	rosaNet := &expinfrav1.RosaNetwork{}
+	// Does the control plane reference RosaNetwork?
+	if rosaScope.ControlPlane.Spec.RosaNetworkRef != nil {
+		objKey := client.ObjectKey{
+			Name:      rosaScope.ControlPlane.Spec.RosaNetworkRef.Name,
+			Namespace: rosaScope.ControlPlane.Namespace,
+		}
+
+		err := rosaScope.Client.Get(ctx, objKey, rosaNet)
+		if err != nil {
+			return ctrl.Result{}, fmt.Errorf("failed to fetch RosaNetwork: %w", err)
+		}
+
+		// Is the referenced RosaNetwork ready yet?
+		if !conditions.IsTrue(rosaNet, expinfrav1.RosaNetworkReadyCondition) {
+			rosaScope.Info(fmt.Sprintf("referenced RosaNetwork %s is not ready", rosaNet.Name))
+			return ctrl.Result{RequeueAfter: time.Minute}, nil
+		}
+	}
+
+	ocmClusterSpec, err := buildOCMClusterSpec(rosaScope.ControlPlane.Spec, rosaNet, creator)
 	if err != nil {
 		return ctrl.Result{}, err
 	}
@@ -907,12 +927,25 @@ func validateControlPlaneSpec(ocmClient rosa.OCMClient, rosaScope *scope.ROSACon
 	return "", nil
 }
 
-func buildOCMClusterSpec(controlPlaneSpec rosacontrolplanev1.RosaControlPlaneSpec, creator *rosaaws.Creator) (ocm.Spec, error) {
+func buildOCMClusterSpec(controlPlaneSpec rosacontrolplanev1.RosaControlPlaneSpec, rosaNet *expinfrav1.RosaNetwork, creator *rosaaws.Creator) (ocm.Spec, error) {
 	billingAccount := controlPlaneSpec.BillingAccount
 	if billingAccount == "" {
 		billingAccount = creator.AccountID
 	}
 
+	var subnetIDs []string
+	var availabilityZones []string
+
+	if controlPlaneSpec.RosaNetworkRef == nil {
+		subnetIDs = controlPlaneSpec.Subnets
+		availabilityZones = controlPlaneSpec.AvailabilityZones
+	} else {
+		for _, v := range rosaNet.Status.Subnets {
+			subnetIDs = append(subnetIDs, v.PublicSubnet, v.PrivateSubnet)
+			availabilityZones = append(availabilityZones, v.AvailabilityZone)
+		}
+	}
+
 	ocmClusterSpec := ocm.Spec{
 		DryRun:                    ptr.To(false),
 		Name:                      controlPlaneSpec.RosaClusterName,
@@ -924,12 +957,12 @@ func buildOCMClusterSpec(controlPlaneSpec rosacontrolplanev1.RosaControlPlaneSpe
 		DisableWorkloadMonitoring: ptr.To(true),
 		DefaultIngress:            ocm.NewDefaultIngressSpec(), // n.b. this is a no-op when it's set to the default value
 		ComputeMachineType:        controlPlaneSpec.DefaultMachinePoolSpec.InstanceType,
-		AvailabilityZones:         controlPlaneSpec.AvailabilityZones,
+		AvailabilityZones:         availabilityZones,
 		Tags:                      controlPlaneSpec.AdditionalTags,
 		EtcdEncryption:            controlPlaneSpec.EtcdEncryptionKMSARN != "",
 		EtcdEncryptionKMSArn:      controlPlaneSpec.EtcdEncryptionKMSARN,
 
-		SubnetIds:        controlPlaneSpec.Subnets,
+		SubnetIds:        subnetIDs,
 		IsSTS:            true,
 		RoleARN:          controlPlaneSpec.InstallerRoleARN,
 		SupportRoleARN:   controlPlaneSpec.SupportRoleARN,
@@ -990,8 +1023,8 @@ func buildOCMClusterSpec(controlPlaneSpec rosacontrolplanev1.RosaControlPlaneSpe
 		ocmClusterSpec.Autoscaling = true
 		ocmClusterSpec.MaxReplicas = computeAutoscaling.MaxReplicas
 		ocmClusterSpec.MinReplicas = computeAutoscaling.MinReplicas
-	} else if len(controlPlaneSpec.AvailabilityZones) > 1 {
-		ocmClusterSpec.ComputeNodes = len(controlPlaneSpec.AvailabilityZones)
+	} else if len(ocmClusterSpec.AvailabilityZones) > 1 {
+		ocmClusterSpec.ComputeNodes = len(ocmClusterSpec.AvailabilityZones)
 	}
 
 	if controlPlaneSpec.ProvisionShardID != "" {