🐛 ROSA: Fix RosaControlPlane sync default RosaMachinePool #5629

serngawy · 2025-08-23T09:08:15Z

What type of PR is this?
/kind bug
CAPA does not automatically manage the default "workers" machinepool created by ROSAControlPlane

What this PR does / why we need it:

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

Checklist:

Release note:

Fix ROSA control plane manage default ROSA machine pool

k8s-ci-robot · 2025-08-23T09:08:24Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign neolit123 for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

serngawy · 2025-08-25T09:16:31Z

/cc @marek-veber

k8s-ci-robot · 2025-08-25T09:16:33Z

@serngawy: GitHub didn't allow me to request PR reviews from the following users: marek-veber.

Note that only kubernetes-sigs members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

/cc @marek-veber

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

serngawy · 2025-08-25T09:17:22Z

/cc @nrb

serngawy · 2025-08-27T15:55:58Z

/hold

serngawy · 2025-08-27T16:52:22Z

/unhold

damdo

Left some thoughts, thanks!

damdo · 2025-09-10T07:48:59Z

controllers/rosacluster_controller.go

+			ControllerName: "",
+			Logger:         log,
+			NewStsClient:   r.NewStsClient,
+		})
+		if err != nil {
+			return ctrl.Result{}, fmt.Errorf("failed to create rosa controlplane scope: %w", err)
+		}
+
+		if r.NewOCMClient == nil {
+			return ctrl.Result{}, fmt.Errorf("failed to create OCM client: NewOCMClient is nil")
+		}
+
+		ocmClient, err := r.NewOCMClient(ctx, rosaScope)
+		if err != nil || ocmClient == nil {
+			return ctrl.Result{}, fmt.Errorf("failed to create OCM client: %w", err)
+		}
+
+		nodePools, err := ocmClient.GetNodePools(rosaScope.ControlPlane.Status.ID)
+		if err != nil {
+			return ctrl.Result{}, fmt.Errorf("failed to get nodePools: %w", err)
+		}
+
+		rosaMPNames, err := r.getRosaMachinePoolNames(ctx, cluster)
+		if err != nil {
+			return ctrl.Result{}, fmt.Errorf("failed to get Rosa machinePool names: %w", err)
+		}
+
+		var errs []error
+		for _, nodePool := range nodePools {
+			// continue if nodePool is not in ready state.
+			if !rosa.IsNodePoolReady(nodePool) {
+				continue
+			}
+			// continue if nodePool exist
+			if rosaMPNames[nodePool.ID()] {
+				continue
+			}
+
+			// create RosaMachinePool
+			rosaMPSpec := utils.NodePoolToRosaMachinePoolSpec(nodePool)
+			rosaMachinePool := &expinfrav1.ROSAMachinePool{
+				TypeMeta: metav1.TypeMeta{
+					APIVersion: expinfrav1.GroupVersion.String(),
+					Kind:       "ROSAMachinePool",
+				},
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      nodePool.ID(),
+					Namespace: controlPlane.Namespace,
+					Labels: map[string]string{
+						clusterv1.ClusterNameLabel: cluster.Name,
+					},
+				},
+				Spec: rosaMPSpec,
+			}
+			log.Info(fmt.Sprintf("Create ROSAMachinePool %s", rosaMachinePool.Name))
+			if err = r.Client.Create(ctx, rosaMachinePool); err != nil {
+				errs = append(errs, err)
+			}
+
+			// create MachinePool
+			machinePool := &expclusterv1.MachinePool{
+				TypeMeta: metav1.TypeMeta{
+					APIVersion: expclusterv1.GroupVersion.String(),
+					Kind:       "MachinePool",
+				},
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      nodePool.ID(),
+					Namespace: cluster.Namespace,
+					Labels: map[string]string{
+						clusterv1.ClusterNameLabel: cluster.Name,
+					},
+				},
+				Spec: expclusterv1.MachinePoolSpec{
+					ClusterName: cluster.Name,
+					Replicas:    ptr.To(int32(1)),
+					Template: clusterv1.MachineTemplateSpec{
+						Spec: clusterv1.MachineSpec{
+							ClusterName: cluster.Name,
+							Bootstrap: clusterv1.Bootstrap{
+								DataSecretName: ptr.To(string("")),
+							},
+							InfrastructureRef: corev1.ObjectReference{
+								APIVersion: expinfrav1.GroupVersion.String(),
+								Kind:       "ROSAMachinePool",
+								Name:       rosaMachinePool.Name,
+							},
+						},
+					},
+				},
+			}
+			log.Info(fmt.Sprintf("Create MachinePool %s", machinePool.Name))
+			if err = r.Client.Create(ctx, machinePool); err != nil {
+				errs = append(errs, err)
+			}
+		}
+
+		if len(errs) > 0 {
+			return ctrl.Result{}, kerrors.NewAggregate(errs)
+		}
+	}


I think it'd be nice to extract this into a separate function with a descriptive name.
Also I'd add some comments on what is happening here.

Add buildROSAMachinePool func and more comments

controllers/rosacluster_controller.go

controlplane/rosa/controllers/rosacontrolplane_controller.go

damdo · 2025-09-10T14:08:16Z

controllers/rosacluster_controller.go

+	if controlPlane.Status.Ready {
+		rosaScope, err := scope.NewROSAControlPlaneScope(scope.ROSAControlPlaneScopeParams{
+			Client:         r.Client,
+			Cluster:        cluster,
+			ControlPlane:   controlPlane,
+			ControllerName: "",
+			Logger:         log,
+			NewStsClient:   r.NewStsClient,
+		})
+		if err != nil {
+			return ctrl.Result{}, fmt.Errorf("failed to create rosa controlplane scope: %w", err)
+		}
+
+		if r.NewOCMClient == nil {
+			return ctrl.Result{}, fmt.Errorf("failed to create OCM client: NewOCMClient is nil")
+		}
+
+		ocmClient, err := r.NewOCMClient(ctx, rosaScope)
+		if err != nil || ocmClient == nil {
+			return ctrl.Result{}, fmt.Errorf("failed to create OCM client: %w", err)
+		}
+
+		// List the ROSA-HCP nodePools and MachinePools
+		nodePools, err := ocmClient.GetNodePools(rosaScope.ControlPlane.Status.ID)
+		if err != nil {
+			return ctrl.Result{}, fmt.Errorf("failed to get nodePools: %w", err)
+		}
+
+		rosaMPNames, err := r.getRosaMachinePoolNames(ctx, cluster)
+		if err != nil {
+			return ctrl.Result{}, fmt.Errorf("failed to get Rosa machinePool names: %w", err)
+		}
+
+		// Ensure every NodePool has a MachinePool and create a corresponding MachinePool if it does not exist.
+		var errs []error
+		for _, nodePool := range nodePools {
+			// continue if nodePool is not in ready state.
+			if !rosa.IsNodePoolReady(nodePool) {
+				continue
+			}
+			// continue if nodePool exist
+			if rosaMPNames[nodePool.ID()] {
+				continue
+			}
+			// create ROSAMachinePool & MachinePool
+			rosaMachinePool, machinePool := r.buildROSAMachinePool(nodePool.ID(), cluster.Name, cluster.Namespace, nodePool)
+
+			log.Info(fmt.Sprintf("Create ROSAMachinePool %s", rosaMachinePool.Name))
+			if err = r.Client.Create(ctx, rosaMachinePool); err != nil {
+				errs = append(errs, err)
+			}
+
+			log.Info(fmt.Sprintf("Create MachinePool %s", machinePool.Name))
+			if err = r.Client.Create(ctx, machinePool); err != nil {
+				errs = append(errs, err)
+			}
+		}
+
+		if len(errs) > 0 {
+			return ctrl.Result{}, kerrors.NewAggregate(errs)
+		}
+	}
+


I think this entire block could be extracted out to a function with a good name and that simplifies reading this and gaining context without delving into the details

serngawy · 2025-09-11T02:10:32Z

/test pull-cluster-api-provider-aws-apidiff-main

Signed-off-by: serngawy <[email protected]>

k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Aug 23, 2025

k8s-ci-robot requested review from AndiDog and luthermonson August 23, 2025 09:08

k8s-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. needs-priority labels Aug 23, 2025

k8s-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Aug 23, 2025

serngawy force-pushed the rosacluster branch from e238e40 to b9d412d Compare August 23, 2025 09:17

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 23, 2025

serngawy force-pushed the rosacluster branch 2 times, most recently from 490e22e to 2cbe834 Compare August 25, 2025 08:30

k8s-ci-robot requested a review from nrb August 25, 2025 09:17

AndiDog changed the title ~~🐛 ROSA: Fix RosaControlPlane sync defaulet RosaMachinePool~~ 🐛 ROSA: Fix RosaControlPlane sync default RosaMachinePool Aug 27, 2025

serngawy force-pushed the rosacluster branch from 2cbe834 to 0bccdea Compare August 27, 2025 14:26

k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 27, 2025

serngawy force-pushed the rosacluster branch from 0bccdea to 4c429cf Compare August 27, 2025 16:51

k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 27, 2025

serngawy force-pushed the rosacluster branch from 4c429cf to 79bdbab Compare August 28, 2025 14:45

damdo reviewed Sep 10, 2025

View reviewed changes

serngawy force-pushed the rosacluster branch 2 times, most recently from 80cbf54 to 8671a32 Compare September 10, 2025 13:07

damdo reviewed Sep 10, 2025

View reviewed changes

serngawy force-pushed the rosacluster branch from 8671a32 to 3641b8a Compare September 10, 2025 22:00

serngawy force-pushed the rosacluster branch from 3641b8a to 1600047 Compare September 11, 2025 02:18

Fix RosaControlPlane sync defaulet RosaMachinePool

1600047

Signed-off-by: serngawy <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

🐛 ROSA: Fix RosaControlPlane sync default RosaMachinePool #5629

🐛 ROSA: Fix RosaControlPlane sync default RosaMachinePool #5629

serngawy commented Aug 23, 2025 •

edited

Loading

Uh oh!

k8s-ci-robot commented Aug 23, 2025

Uh oh!

serngawy commented Aug 25, 2025

Uh oh!

k8s-ci-robot commented Aug 25, 2025

Uh oh!

serngawy commented Aug 25, 2025

Uh oh!

serngawy commented Aug 27, 2025

Uh oh!

serngawy commented Aug 27, 2025

Uh oh!

damdo left a comment

Uh oh!

damdo Sep 10, 2025

Uh oh!

serngawy Sep 10, 2025

Uh oh!

Uh oh!

Uh oh!

damdo Sep 10, 2025

Uh oh!

serngawy Sep 10, 2025

Uh oh!

serngawy commented Sep 11, 2025

Uh oh!

Uh oh!

🐛 ROSA: Fix RosaControlPlane sync default RosaMachinePool #5629

Are you sure you want to change the base?

🐛 ROSA: Fix RosaControlPlane sync default RosaMachinePool #5629

Conversation

serngawy commented Aug 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

k8s-ci-robot commented Aug 23, 2025

Uh oh!

serngawy commented Aug 25, 2025

Uh oh!

k8s-ci-robot commented Aug 25, 2025

Uh oh!

serngawy commented Aug 25, 2025

Uh oh!

serngawy commented Aug 27, 2025

Uh oh!

serngawy commented Aug 27, 2025

Uh oh!

damdo left a comment

Choose a reason for hiding this comment

Uh oh!

damdo Sep 10, 2025

Choose a reason for hiding this comment

Uh oh!

serngawy Sep 10, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

damdo Sep 10, 2025

Choose a reason for hiding this comment

Uh oh!

serngawy Sep 10, 2025

Choose a reason for hiding this comment

Uh oh!

serngawy commented Sep 11, 2025

Uh oh!

Uh oh!

serngawy commented Aug 23, 2025 •

edited

Loading