Merge pull request #2855 from hunterkepley/ocm-15096

OCM-15096 | feat: Introduce `channel-group` in edit/cluster

Author: openshift-merge-bot[bot]

cmd/edit/cluster/cmd.go

@@ -73,6 +73,9 @@ var args struct {
 	// SDN -> OVN Migration
 	networkType        string
 	ovnInternalSubnets string
+
+	// Added for EUS region support
+	channelGroup string
 }
 
 var clusterRegistryConfigArgs *clusterregistryconfig.ClusterRegistryConfigArgs
@@ -207,6 +210,14 @@ func init() {
 			"followed by a CIDR. \nExample: '--ovn-internal-subnets=\"join=192.168.255.0/24,transit=192.168.255.0/24,"+
 			"masquerade=192.168.255.0/24\"'",
 	)
+
+	flags.StringVar(
+		&args.channelGroup,
+		"channel-group",
+		ocm.DefaultChannelGroup,
+		"Changes the channel group used for cluster versions. "+
+			"Channel group is the name of the channel where this image belongs, for example \"stable\" or \"eus\".",
+	)
 }
 
 func run(cmd *cobra.Command, _ []string) {
@@ -870,6 +881,10 @@ func run(cmd *cobra.Command, _ []string) {
 		clusterConfig.BillingAccount = billingAccount
 	}
 
+	if args.channelGroup != "" {
+		clusterConfig.ChannelGroup = args.channelGroup
+	}
+
 	r.Reporter.Debugf("Updating cluster '%s'", clusterKey)
 	err = r.OCMClient.UpdateCluster(cluster.ID(), r.Creator, clusterConfig)
 	if err != nil {

cmd/rosa/structure_test/command_args/rosa/edit/cluster/command_args.yml

@@ -23,3 +23,4 @@
 - name: billing-account
 - name: network-type
 - name: ovn-internal-subnets
+- name: channel-group

pkg/ocm/clusters.go

@@ -588,6 +588,13 @@ func (c *Client) UpdateCluster(clusterKey string, creator *aws.Creator, config S
 		clusterBuilder = clusterBuilder.ExpirationTimestamp(config.Expiration)
 	}
 
+	// Update channel group
+	if config.ChannelGroup != "" {
+		clusterBuilder.Version(cmv1.NewVersion().
+			ChannelGroup(config.ChannelGroup),
+		)
+	}
+
 	// Scale cluster
 	clusterNodesBuilder, updateNodes := c.getClusterNodesBuilder(config)
 	if updateNodes {