Merge pull request #5337 from tinaafitz/fix_version_error_msg

k8s-ci-robot · web-flow · commit 44634612cb5d · 2025-03-04T11:11:44.000-08:00
🌱 ROSA Modified rosacontrolplane_controller version error messages.
diff --git a/controlplane/rosa/controllers/rosacontrolplane_controller.go b/controlplane/rosa/controllers/rosacontrolplane_controller.go
@@ -892,10 +892,10 @@ func validateControlPlaneSpec(ocmClient rosa.OCMClient, rosaScope *scope.ROSACon
 	channelGroup := string(rosaScope.ControlPlane.Spec.ChannelGroup)
 	valid, err := ocmClient.ValidateHypershiftVersion(version, channelGroup)
 	if err != nil {
-		return "", fmt.Errorf("failed to check if version is valid: %w", err)
+		return "", fmt.Errorf("error validating version in this channelGroup : %w", err)
 	}
 	if !valid {
-		return fmt.Sprintf("version %s is not supported", version), nil
+		return fmt.Sprintf("this version %s is not supported in this channelGroup", version), nil
 	}
 
 	// TODO: add more input validations

Original file line number	Diff line number	Diff line change
`@@ -892,10 +892,10 @@ func validateControlPlaneSpec(ocmClient rosa.OCMClient, rosaScope *scope.ROSACon`
`892`	`892`	`channelGroup := string(rosaScope.ControlPlane.Spec.ChannelGroup)`
`893`	`893`	`valid, err := ocmClient.ValidateHypershiftVersion(version, channelGroup)`
`894`	`894`	`if err != nil {`
`895`		`- return "", fmt.Errorf("failed to check if version is valid: %w", err)`
	`895`	`+ return "", fmt.Errorf("error validating version in this channelGroup : %w", err)`
`896`	`896`	`}`
`897`	`897`	`if !valid {`
`898`		`- return fmt.Sprintf("version %s is not supported", version), nil`
	`898`	`+ return fmt.Sprintf("this version %s is not supported in this channelGroup", version), nil`
`899`	`899`	`}`
`900`	`900`
`901`	`901`	`// TODO: add more input validations`