Enhance the channel handling logic.

Author: tinaafitz

controlplane/rosa/controllers/rosacontrolplane_controller.go

@@ -758,20 +758,60 @@ func (r *ROSAControlPlaneReconciler) updateOCMClusterSpec(rosaControlPlane *rosa
 		updated = true
 	}
 
-	// Check for channel changes
-	desiredChannel := getEffectiveChannel(rosaControlPlane.Spec)
-	desiredChannelGroup := getChannelGroupFromChannel(desiredChannel)
-
+	// Check for channel changes using sophisticated request handling logic
 	// Reconstruct current channel from OCM cluster
 	var currentChannel string
+	var currentChannelGroup string
 	if cluster.Version() != nil && cluster.Version().ChannelGroup() != "" {
+		currentChannelGroup = cluster.Version().ChannelGroup()
 		versionID := cluster.Version().ID()
 		versionParts := strings.Split(versionID, ".")
 		if len(versionParts) >= 2 {
-			currentChannel = fmt.Sprintf("%s-%s.%s", cluster.Version().ChannelGroup(), versionParts[0], versionParts[1])
+			currentChannel = fmt.Sprintf("%s-%s.%s", currentChannelGroup, versionParts[0], versionParts[1])
+		}
+	}
+
+	var desiredChannel string
+	var desiredChannelGroup string
+
+	// Case 1: User explicitly set channel field - use it directly
+	if rosaControlPlane.Spec.Channel != "" {
+		desiredChannel = rosaControlPlane.Spec.Channel
+		desiredChannelGroup = getChannelGroupFromChannel(desiredChannel)
+	} else {
+		// Case 2 & 3: User set channelGroup (or using default)
+		requestedChannelGroup := string(rosaControlPlane.Spec.ChannelGroup)
+
+		// Case 2: channelGroup matches current channel's group - no update needed
+		if requestedChannelGroup == currentChannelGroup {
+			// No change needed, keep current channel
+			desiredChannel = currentChannel
+			desiredChannelGroup = currentChannelGroup
+		} else {
+			// Case 3: New channelGroup - intelligently construct new channel
+			// Try to preserve current Y-stream: ${new_channel_group}-${current_channel_Y}
+			if currentChannel != "" {
+				// Extract Y-stream from current channel (e.g., "stable-4.18" -> "4.18")
+				parts := strings.Split(currentChannel, "-")
+				if len(parts) == 2 {
+					currentYStream := parts[1]
+					desiredChannel = fmt.Sprintf("%s-%s", requestedChannelGroup, currentYStream)
+					desiredChannelGroup = requestedChannelGroup
+				}
+			}
+
+			// Fallback: derive from version if we couldn't preserve Y-stream
+			if desiredChannel == "" {
+				versionParts := strings.Split(rosaControlPlane.Spec.Version, ".")
+				if len(versionParts) >= 2 {
+					desiredChannel = fmt.Sprintf("%s-%s.%s", requestedChannelGroup, versionParts[0], versionParts[1])
+					desiredChannelGroup = requestedChannelGroup
+				}
+			}
 		}
 	}
 
+	// Only update if channel actually changed
 	if desiredChannel != currentChannel && desiredChannel != "" {
 		ocmClusterSpec.Channel = desiredChannel
 		ocmClusterSpec.ChannelGroup = desiredChannelGroup

controlplane/rosa/controllers/rosacontrolplane_controller_test.go

@@ -233,6 +233,111 @@ func TestUpdateOCMClusterSpec(t *testing.T) {
 		g.Expect(updated).To(BeTrue())
 		g.Expect(ocmSpec).To(Equal(expectedOCMSpec))
 	})
+
+	// Test case 8: Channel explicitly set - use it directly
+	t.Run("Channel explicitly set", func(t *testing.T) {
+		rosaControlPlane := &rosacontrolplanev1.ROSAControlPlane{
+			Spec: rosacontrolplanev1.RosaControlPlaneSpec{
+				Channel:      "eus-4.18",
+				ChannelGroup: rosacontrolplanev1.Stable, // Different from channel, but channel takes precedence
+				Version:      "4.16.5",
+			},
+		}
+
+		mockCluster, _ := v1.NewCluster().
+			Version(v1.NewVersion().
+				ID("4.16.5").
+				ChannelGroup("stable")).
+			Build()
+
+		expectedOCMSpec := ocm.Spec{
+			Channel:      "eus-4.18",
+			ChannelGroup: "eus",
+		}
+
+		reconciler := &ROSAControlPlaneReconciler{}
+		ocmSpec, updated := reconciler.updateOCMClusterSpec(rosaControlPlane, mockCluster)
+
+		g.Expect(updated).To(BeTrue())
+		g.Expect(ocmSpec.Channel).To(Equal("eus-4.18"))
+		g.Expect(ocmSpec.ChannelGroup).To(Equal("eus"))
+	})
+
+	// Test case 9: ChannelGroup matches current - no update
+	t.Run("ChannelGroup matches current channel group - no update", func(t *testing.T) {
+		rosaControlPlane := &rosacontrolplanev1.ROSAControlPlane{
+			Spec: rosacontrolplanev1.RosaControlPlaneSpec{
+				ChannelGroup: rosacontrolplanev1.Stable,
+				Version:      "4.16.5",
+			},
+		}
+
+		mockCluster, _ := v1.NewCluster().
+			Version(v1.NewVersion().
+				ID("4.18.3").
+				ChannelGroup("stable")).
+			Build()
+
+		reconciler := &ROSAControlPlaneReconciler{}
+		ocmSpec, updated := reconciler.updateOCMClusterSpec(rosaControlPlane, mockCluster)
+
+		g.Expect(updated).To(BeFalse())
+		g.Expect(ocmSpec.Channel).To(Equal(""))
+	})
+
+	// Test case 10: New channelGroup - preserve Y-stream
+	t.Run("New channelGroup preserves current Y-stream", func(t *testing.T) {
+		rosaControlPlane := &rosacontrolplanev1.ROSAControlPlane{
+			Spec: rosacontrolplanev1.RosaControlPlaneSpec{
+				ChannelGroup: rosacontrolplanev1.EUS, // Changing from stable to eus
+				Version:      "4.16.5",
+			},
+		}
+
+		// Current cluster is on stable-4.18
+		mockCluster, _ := v1.NewCluster().
+			Version(v1.NewVersion().
+				ID("4.18.3").
+				ChannelGroup("stable")).
+			Build()
+
+		expectedOCMSpec := ocm.Spec{
+			Channel:      "eus-4.18", // Preserves 4.18 Y-stream from current
+			ChannelGroup: "eus",
+		}
+
+		reconciler := &ROSAControlPlaneReconciler{}
+		ocmSpec, updated := reconciler.updateOCMClusterSpec(rosaControlPlane, mockCluster)
+
+		g.Expect(updated).To(BeTrue())
+		g.Expect(ocmSpec.Channel).To(Equal("eus-4.18"))
+		g.Expect(ocmSpec.ChannelGroup).To(Equal("eus"))
+	})
+
+	// Test case 11: New channelGroup, no current channel - derive from version
+	t.Run("New channelGroup with no current channel - derive from version", func(t *testing.T) {
+		rosaControlPlane := &rosacontrolplanev1.ROSAControlPlane{
+			Spec: rosacontrolplanev1.RosaControlPlaneSpec{
+				ChannelGroup: rosacontrolplanev1.EUS,
+				Version:      "4.16.5",
+			},
+		}
+
+		// Cluster has no version info (edge case)
+		mockCluster, _ := v1.NewCluster().Build()
+
+		expectedOCMSpec := ocm.Spec{
+			Channel:      "eus-4.16", // Derives from version
+			ChannelGroup: "eus",
+		}
+
+		reconciler := &ROSAControlPlaneReconciler{}
+		ocmSpec, updated := reconciler.updateOCMClusterSpec(rosaControlPlane, mockCluster)
+
+		g.Expect(updated).To(BeTrue())
+		g.Expect(ocmSpec.Channel).To(Equal("eus-4.16"))
+		g.Expect(ocmSpec.ChannelGroup).To(Equal("eus"))
+	})
 }
 
 func TestValidateControlPlaneSpec(t *testing.T) {