OCM-6391 | fix: Change default value for disable region dep. flag

openshift · May 1, 2024 · a511dea · a511dea
1 parent cd2d1ab
commit a511dea
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/cmd/create/cluster/cmd.go b/cmd/create/cluster/cmd.go
@@ -3218,7 +3218,7 @@ func run(cmd *cobra.Command, _ []string) {
 		" print for cluster describe called inside cluster create, but there is a use for a lone describe."
 	var disableRegionDeprecation bool
 	clusterdescribe.Cmd.LocalFlags().BoolVar(&disableRegionDeprecation, arguments.DisableRegionDeprecationFlagName,
-		true, disableUsage)
+		false, disableUsage)
 	clusterdescribe.Cmd.Run(clusterdescribe.Cmd, []string{cluster.ID()})
 	disableRegionDeprecation = false // No longer disable
 
@@ -3229,13 +3229,13 @@ func run(cmd *cobra.Command, _ []string) {
 			}
 			disableRegionDeprecation = true // disable again
 			operatorroles.Cmd.LocalFlags().BoolVar(&disableRegionDeprecation, arguments.DisableRegionDeprecationFlagName,
-				true, disableUsage)
+				false, disableUsage)
 			operatorroles.Cmd.Run(operatorroles.Cmd, []string{clusterName, mode, permissionsBoundary})
 			if !output.HasFlag() || r.Reporter.IsTerminal() {
 				r.Reporter.Infof("Preparing to create OIDC Provider.")
 			}
 			oidcprovider.Cmd.LocalFlags().BoolVar(&disableRegionDeprecation, arguments.DisableRegionDeprecationFlagName,
-				true, disableUsage)
+				false, disableUsage)
 			oidcprovider.Cmd.Run(oidcprovider.Cmd, []string{clusterName, mode, ""})
 			disableRegionDeprecation = false // No longer disable
 		} else {
@@ -3272,7 +3272,11 @@ func run(cmd *cobra.Command, _ []string) {
 	}
 
 	if args.watch {
+		disableRegionDeprecation = true // Disable region deprecation
+		clusterdescribe.Cmd.LocalFlags().BoolVar(&disableRegionDeprecation, arguments.DisableRegionDeprecationFlagName,
+			false, disableUsage)
 		installLogs.Cmd.Run(installLogs.Cmd, []string{clusterName})
+		disableRegionDeprecation = false // No longer disable
 	} else if !output.HasFlag() || r.Reporter.IsTerminal() {
 		r.Reporter.Infof(
 			"To determine when your cluster is Ready, run 'rosa describe cluster -c %s'.",