refactor: improve display names for components and dependencies

Use proper display names in user-facing messages:
- ModelMesh -> ModelMesh Serving
- CertManager -> cert-manager with full display name
- RHBOK -> Red Hat build of Kueue
- Fix cert-manager Kind to use hyphenated form consistently

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: lburgazzoli

docs/migrate/implementation-plan.md

@@ -2,7 +2,7 @@
 
 ## Overview
 
-Implement a `migrate` subcommand for odh-cli that performs cluster migrations, specifically migrating from OpenShift AI's built-in Kueue to the Red Hat Build of Kueue (RHBOK) operator. The command will mirror the `lint` command architecture but add capabilities for cluster modification, dry-run mode, preparation, and user confirmations.
+Implement a `migrate` subcommand for odh-cli that performs cluster migrations, specifically migrating from OpenShift AI's built-in Kueue to the Red Hat build of Kueue operator. The command will mirror the `lint` command architecture but add capabilities for cluster modification, dry-run mode, preparation, and user confirmations.
 
 ## Requirements Summary
 
@@ -12,7 +12,7 @@ Implement a `migrate` subcommand for odh-cli that performs cluster migrations, s
 - `-y` / `--yes`: Skip confirmation prompts (default: ask for each step)
 - Standard flags: `--output`, `--timeout`, `--verbose` (reuse from lint)
 
-### RHBOK Migration Steps
+### Red Hat build of Kueue Migration Steps
 1. Install Red Hat Build of Kueue Operator from OperatorHub
 2. Update DataScienceCluster: set `spec.components.kueue.managementState` to `Unmanaged`
 3. Verify ClusterQueue and LocalQueue resources are preserved
@@ -181,7 +181,7 @@ if !target.SkipConfirm {
 }
 ```
 
-### Phase 4: RHBOK Migration Action
+### Phase 4: Red Hat build of Kueue Migration Action
 
 #### 4.1 Main Action Implementation
 **File:** `pkg/migrate/actions/kueue/rhbok/rhbok.go`
@@ -203,15 +203,15 @@ func (a *RHBOKMigrationAction) CanApply(currentVersion, targetVersion *semver.Ve
 func (a *RHBOKMigrationAction) Validate(ctx, target) (*result.ActionResult, error) {
     // Pre-flight checks:
     // 1. Verify current Kueue state
-    // 2. Check for RHBOK conflicts
+    // 2. Check for Red Hat build of Kueue conflicts
     // 3. Verify Kueue resources exist
     // 4. Verify RBAC permissions
 }
 
 func (a *RHBOKMigrationAction) Execute(ctx, target) (*result.ActionResult, error) {
-    result := result.New("migration", "rhbok", "execute", "Execute RHBOK migration")
+    result := result.New("migration", "rhbok", "execute", "Execute Red Hat build of Kueue migration")
 
-    // Step 1: Install RHBOK Operator
+    // Step 1: Install Red Hat build of Kueue Operator
     step1 := a.installRHBOKOperator(ctx, target)
     result.Status.Steps = append(result.Status.Steps, step1)
     if step1.Status == result.StepFailed {
@@ -234,7 +234,7 @@ func (a *RHBOKMigrationAction) Execute(ctx, target) (*result.ActionResult, error
 }
 ```
 
-#### 4.2 Install RHBOK Operator
+#### 4.2 Install Red Hat build of Kueue Operator
 **Method:** `installRHBOKOperator(ctx, target) ActionStep`
 
 1. Check if dry-run: return skipped step with message
@@ -409,7 +409,7 @@ import (
 $ kubectl odh migrate list --target-version 3.0.0
 
 ID                      NAME                          APPLICABLE  DESCRIPTION
-kueue.rhbok.migrate     Migrate Kueue to RHBOK        Yes         Migrates from OpenShift AI built-in Kueue...
+kueue.rhbok.migrate     Migrate Kueue to Red Hat build of Kueue        Yes         Migrates from OpenShift AI built-in Kueue...
 ```
 
 ### Default (with confirmations)
@@ -425,10 +425,10 @@ Migration Steps:
 2. Update DataScienceCluster Kueue managementState to Unmanaged
 3. Verify ClusterQueue and LocalQueue resources preserved
 
-[Step 1/3] Installing RHBOK Operator...
-About to install Red Hat Build of Kueue Operator
+[Step 1/3] Installing Red Hat build of Kueue Operator...
+About to install Red Hat build of Kueue Operator
 Proceed with operator installation? [y/N]: y
-✓ RHBOK operator installed successfully
+✓ Red Hat build of Kueue operator installed successfully
 
 [Step 2/3] Updating DataScienceCluster...
 About to update DataScienceCluster Kueue managementState to Unmanaged
@@ -450,8 +450,8 @@ Current OpenShift AI version: 2.25.0
 Target OpenShift AI version: 3.0.0
 Running migration: kueue.rhbok.migrate (confirmations skipped)
 
-[Step 1/3] Installing RHBOK Operator...
-✓ RHBOK operator installed successfully
+[Step 1/3] Installing Red Hat build of Kueue Operator...
+✓ Red Hat build of Kueue operator installed successfully
 
 [Step 2/3] Updating DataScienceCluster...
 ✓ DataScienceCluster updated successfully
@@ -468,7 +468,7 @@ $ kubectl odh migrate run --migration kueue.rhbok.migrate --target-version 3.0.0
 
 DRY RUN MODE: No changes will be made to the cluster
 
-[Step 1/3] Install RHBOK Operator
+[Step 1/3] Install Red Hat build of Kueue Operator
   → Would create Subscription kueue-operator in openshift-kueue-operator
   → Would wait for CSV kueue-operator.v1.x.x to be ready
 
@@ -490,7 +490,7 @@ Running pre-flight checks for migration: kueue.rhbok.migrate
 
 Pre-flight Validation:
 ✓ Current Kueue state verified
-✓ No RHBOK conflicts detected
+✓ No Red Hat build of Kueue conflicts detected
 ✓ Kueue resources found: 3 ClusterQueues, 5 LocalQueues
 ✓ Sufficient permissions verified
 
@@ -512,8 +512,8 @@ Target OpenShift AI version: 3.0.0
 === Migration 1/2: kueue.rhbok.migrate ===
 Running migration: kueue.rhbok.migrate (confirmations skipped)
 
-[Step 1/3] Installing RHBOK Operator...
-✓ RHBOK operator installed successfully
+[Step 1/3] Installing Red Hat build of Kueue Operator...
+✓ Red Hat build of Kueue operator installed successfully
 
 [Step 2/3] Updating DataScienceCluster...
 ✓ DataScienceCluster updated successfully
@@ -545,7 +545,7 @@ All migrations completed successfully!
 6. `pkg/migrate/action/global.go` - Global registry
 7. `pkg/migrate/action/executor.go` - Sequential executor
 8. `pkg/migrate/action/result/result.go` - Result types
-9. `pkg/migrate/actions/kueue/rhbok/rhbok.go` - RHBOK action
+9. `pkg/migrate/actions/kueue/rhbok/rhbok.go` - Red Hat build of Kueue action
 10. `pkg/migrate/actions/kueue/rhbok/backup.go` - Backup logic
 11. `pkg/migrate/actions/kueue/rhbok/preflight.go` - Pre-flight checks
 12. `pkg/util/confirmation/confirmation.go` - User confirmation
@@ -585,4 +585,4 @@ All migrations completed successfully!
 - Lint command: `cmd/lint/lint.go`, `pkg/cmd/lint/lint.go`
 - Check executor: `pkg/lint/check/executor.go`
 - Existing Kueue checks: `pkg/lint/checks/components/kueue/kueue.go`
-- RHBOK migration docs: Red Hat OpenShift AI 2.25 documentation
+- Red Hat build of Kueue migration docs: Red Hat OpenShift AI 2.25 documentation

pkg/lint/check/validate/validate_test.go

@@ -394,7 +394,7 @@ func newTestOperatorCheck() *testCheck {
 	return &testCheck{
 		BaseCheck: check.BaseCheck{
 			CheckGroup:       check.GroupDependency,
-			Kind:             "certmanager",
+			Kind:             "cert-manager",
 			Type:             check.CheckTypeInstalled,
 			CheckID:          "test.operator.check",
 			CheckName:        "Test Operator Check",
@@ -454,7 +454,7 @@ func TestOperatorBuilder(t *testing.T) {
 		g.Expect(err).ToNot(HaveOccurred())
 		g.Expect(dr).ToNot(BeNil())
 		g.Expect(dr.Group).To(Equal("dependency"))
-		g.Expect(dr.Kind).To(Equal("certmanager"))
+		g.Expect(dr.Kind).To(Equal("cert-manager"))
 		g.Expect(dr.Name).To(Equal(string(check.CheckTypeInstalled)))
 		g.Expect(dr.Status.Conditions).To(HaveLen(1))
 		g.Expect(dr.Status.Conditions[0].Condition).To(MatchFields(IgnoreExtras, Fields{
@@ -468,7 +468,7 @@ func TestOperatorBuilder(t *testing.T) {
 	t.Run("should return found when operator is installed", func(t *testing.T) {
 		sub := &operatorsv1alpha1.Subscription{
 			ObjectMeta: metav1.ObjectMeta{
-				Name:      "certmanager",
+				Name:      "cert-manager",
 				Namespace: "cert-manager",
 			},
 			Status: operatorsv1alpha1.SubscriptionStatus{

pkg/lint/check/verbose_formatter_test.go

@@ -52,7 +52,7 @@ func TestDefaultVerboseFormatter_NamespacedObjects(t *testing.T) {
 func TestDefaultVerboseFormatter_ClusterScopedObjects(t *testing.T) {
 	g := NewWithT(t)
 
-	dr := result.New("dependency", "certmanager", "installed", "test description")
+	dr := result.New("dependency", "cert-manager", "installed", "test description")
 	dr.ImpactedObjects = []metav1.PartialObjectMetadata{
 		{
 			TypeMeta:   metav1.TypeMeta{Kind: "ClusterRole"},

pkg/lint/checks/components/kueue/kueue.go

@@ -18,12 +18,12 @@ import (
 const (
 	kind                       = "kueue"
 	checkTypeManagementState   = "management-state"
-	managementStateRemediation = "Migrate to the RHBoK operator following https://docs.redhat.com/en/documentation/red_hat_openshift_ai_self-managed/2.25/html/managing_openshift_ai/managing-workloads-with-kueue#migrating-to-the-rhbok-operator_kueue before upgrading"
+	managementStateRemediation = "Migrate to the Red Hat build of Kueue operator following https://docs.redhat.com/en/documentation/red_hat_openshift_ai_self-managed/2.25/html/managing_openshift_ai/managing-workloads-with-kueue#migrating-to-the-rhbok-operator_kueue before upgrading"
 )
 
 // ManagementStateCheck validates that Kueue managed option is not used before upgrading to 3.x.
 // In RHOAI 3.x, the Managed option for Kueue is removed — users must migrate to the standalone
-// Kueue operator (RHBOK) and set managementState to Removed or Unmanaged.
+// Red Hat build of Kueue operator and set managementState to Removed or Unmanaged.
 type ManagementStateCheck struct {
 	check.BaseCheck
 }

pkg/lint/checks/components/kueue/kueue_operator_installed.go

@@ -21,10 +21,10 @@ const (
 	annotationInstalledVersion = "operator.opendatahub.io/installed-version"
 )
 
-// OperatorInstalledCheck validates the RHBoK operator installation status against the Kueue
+// OperatorInstalledCheck validates the Red Hat build of Kueue operator installation status against the Kueue
 // component management state:
 //   - Managed + operator present: blocking — the two cannot coexist
-//   - Unmanaged + operator absent: blocking — Unmanaged requires the RHBoK operator
+//   - Unmanaged + operator absent: blocking — Unmanaged requires the Red Hat build of Kueue operator
 type OperatorInstalledCheck struct {
 	check.BaseCheck
 }
@@ -37,7 +37,7 @@ func NewOperatorInstalledCheck() *OperatorInstalledCheck {
 			Type:             checkTypeOperatorInstalled,
 			CheckID:          "components.kueue.operator-installed",
 			CheckName:        "Components :: Kueue :: Operator Installed",
-			CheckDescription: "Validates RHBoK operator installation is consistent with Kueue management state",
+			CheckDescription: "Validates Red Hat build of Kueue operator installation is consistent with Kueue management state",
 		},
 	}
 }
@@ -61,7 +61,7 @@ func (c *OperatorInstalledCheck) Validate(ctx context.Context, target check.Targ
 				return sub.Name == subscriptionName
 			})
 			if err != nil {
-				return fmt.Errorf("checking RHBoK operator presence: %w", err)
+				return fmt.Errorf("checking Red Hat build of Kueue operator presence: %w", err)
 			}
 
 			if info.GetVersion() != "" {
@@ -79,7 +79,7 @@ func (c *OperatorInstalledCheck) Validate(ctx context.Context, target check.Targ
 		})
 }
 
-// validateManaged checks that the RHBoK operator is NOT installed when Kueue is Managed.
+// validateManaged checks that the Red Hat build of Kueue operator is NOT installed when Kueue is Managed.
 func (c *OperatorInstalledCheck) validateManaged(
 	req *validate.ComponentRequest,
 	info *olm.SubscriptionInfo,
@@ -90,20 +90,20 @@ func (c *OperatorInstalledCheck) validateManaged(
 			check.ConditionTypeCompatible,
 			metav1.ConditionFalse,
 			check.WithReason(check.ReasonVersionIncompatible),
-			check.WithMessage("RHBoK operator (%s) is installed but Kueue managementState is Managed — the two cannot coexist", info.GetVersion()),
+			check.WithMessage("Red Hat build of Kueue operator (%s) is installed but Kueue managementState is Managed — the two cannot coexist", info.GetVersion()),
 			check.WithImpact(result.ImpactBlocking),
 		))
 	default:
 		req.Result.SetCondition(check.NewCondition(
 			check.ConditionTypeCompatible,
 			metav1.ConditionTrue,
 			check.WithReason(check.ReasonVersionCompatible),
-			check.WithMessage("RHBoK operator is not installed — consistent with Managed state"),
+			check.WithMessage("Red Hat build of Kueue operator is not installed — consistent with Managed state"),
 		))
 	}
 }
 
-// validateUnmanaged checks that the RHBoK operator IS installed when Kueue is Unmanaged.
+// validateUnmanaged checks that the Red Hat build of Kueue operator IS installed when Kueue is Unmanaged.
 func (c *OperatorInstalledCheck) validateUnmanaged(
 	req *validate.ComponentRequest,
 	info *olm.SubscriptionInfo,
@@ -114,15 +114,15 @@ func (c *OperatorInstalledCheck) validateUnmanaged(
 			check.ConditionTypeCompatible,
 			metav1.ConditionFalse,
 			check.WithReason(check.ReasonVersionIncompatible),
-			check.WithMessage("RHBoK operator is not installed but Kueue managementState is Unmanaged — RHBoK operator is required"),
+			check.WithMessage("Red Hat build of Kueue operator is not installed but Kueue managementState is Unmanaged — Red Hat build of Kueue operator is required"),
 			check.WithImpact(result.ImpactBlocking),
 		))
 	default:
 		req.Result.SetCondition(check.NewCondition(
 			check.ConditionTypeCompatible,
 			metav1.ConditionTrue,
 			check.WithReason(check.ReasonVersionCompatible),
-			check.WithMessage("RHBoK operator installed: %s", info.GetVersion()),
+			check.WithMessage("Red Hat build of Kueue operator installed: %s", info.GetVersion()),
 		))
 	}
 }

pkg/lint/checks/components/kueue/kueue_operator_installed_test.go

@@ -128,7 +128,7 @@ func TestOperatorInstalledCheck_ManagedInstalled(t *testing.T) {
 		"Type":    Equal(check.ConditionTypeCompatible),
 		"Status":  Equal(metav1.ConditionFalse),
 		"Reason":  Equal(check.ReasonVersionIncompatible),
-		"Message": And(ContainSubstring("RHBoK operator"), ContainSubstring("cannot coexist")),
+		"Message": And(ContainSubstring("Red Hat build of Kueue operator"), ContainSubstring("cannot coexist")),
 	}))
 	g.Expect(result.Status.Conditions[0].Impact).To(Equal(resultpkg.ImpactBlocking))
 	g.Expect(result.Annotations).To(HaveKeyWithValue("operator.opendatahub.io/installed-version", "kueue-operator.v0.6.0"))

pkg/lint/checks/components/modelmesh/modelmesh.go

@@ -15,7 +15,7 @@ import (
 
 const kind = "modelmeshserving"
 
-// RemovalCheck validates that ModelMesh is disabled before upgrading to 3.x.
+// RemovalCheck validates that ModelMesh Serving is disabled before upgrading to 3.x.
 type RemovalCheck struct {
 	check.BaseCheck
 }
@@ -27,15 +27,15 @@ func NewRemovalCheck() *RemovalCheck {
 			Kind:             kind,
 			Type:             check.CheckTypeRemoval,
 			CheckID:          "components.modelmesh.removal",
-			CheckName:        "Components :: ModelMesh :: Removal (3.x)",
-			CheckDescription: "Validates that ModelMesh is disabled before upgrading from RHOAI 2.x to 3.x (component will be removed)",
-			CheckRemediation: "Disable ModelMesh by setting managementState to 'Removed' in DataScienceCluster before upgrading",
+			CheckName:        "Components :: ModelMesh Serving :: Removal (3.x)",
+			CheckDescription: "Validates that ModelMesh Serving is disabled before upgrading from RHOAI 2.x to 3.x (component will be removed)",
+			CheckRemediation: "Disable ModelMesh Serving by setting managementState to 'Removed' in DataScienceCluster before upgrading",
 		},
 	}
 }
 
 // CanApply returns whether this check should run for the given target.
-// This check only applies when upgrading FROM 2.x TO 3.x and ModelMesh is Managed.
+// This check only applies when upgrading FROM 2.x TO 3.x and ModelMesh Serving is Managed.
 func (c *RemovalCheck) CanApply(ctx context.Context, target check.Target) (bool, error) {
 	if !version.IsUpgradeFrom2xTo3x(target.CurrentVersion, target.TargetVersion) {
 		return false, nil
@@ -51,7 +51,7 @@ func (c *RemovalCheck) CanApply(ctx context.Context, target check.Target) (bool,
 
 func (c *RemovalCheck) Validate(ctx context.Context, target check.Target) (*result.DiagnosticResult, error) {
 	return validate.Component(c, target).
-		Run(ctx, validate.Removal("ModelMesh is enabled (state: %s) but will be removed in RHOAI %s",
+		Run(ctx, validate.Removal("ModelMesh Serving is enabled (state: %s) but will be removed in RHOAI %s",
 			check.WithImpact(result.ImpactBlocking),
 			check.WithRemediation(c.CheckRemediation)))
 }

pkg/lint/checks/components/modelmesh/modelmesh_test.go

@@ -159,7 +159,7 @@ func TestModelmeshRemovalCheck_Metadata(t *testing.T) {
 	modelmeshCheck := modelmesh.NewRemovalCheck()
 
 	g.Expect(modelmeshCheck.ID()).To(Equal("components.modelmesh.removal"))
-	g.Expect(modelmeshCheck.Name()).To(Equal("Components :: ModelMesh :: Removal (3.x)"))
+	g.Expect(modelmeshCheck.Name()).To(Equal("Components :: ModelMesh Serving :: Removal (3.x)"))
 	g.Expect(modelmeshCheck.Group()).To(Equal(check.GroupComponent))
 	g.Expect(modelmeshCheck.Description()).ToNot(BeEmpty())
 }

pkg/lint/checks/dependencies/certmanager/certmanager.go

@@ -10,7 +10,9 @@ import (
 	"github.com/opendatahub-io/odh-cli/pkg/lint/check/validate"
 )
 
-const kind = "certmanager"
+const kind = "cert-manager"
+
+const displayName = "cert-manager Operator for Red Hat OpenShift"
 
 // Check validates cert-manager operator installation.
 type Check struct {
@@ -24,7 +26,7 @@ func NewCheck() *Check {
 			Kind:             kind,
 			Type:             check.CheckTypeInstalled,
 			CheckID:          "dependencies.certmanager.installed",
-			CheckName:        "Dependencies :: CertManager :: Installed",
+			CheckName:        "Dependencies :: cert-manager :: Installed",
 			CheckDescription: "Reports the cert-manager operator installation status and version",
 		},
 	}
@@ -43,7 +45,7 @@ func (c *Check) Validate(ctx context.Context, target check.Target) (*result.Diag
 					check.ConditionTypeAvailable,
 					metav1.ConditionFalse,
 					check.WithReason(check.ReasonResourceNotFound),
-					check.WithMessage("%s operator is not installed", kind),
+					check.WithMessage("%s is not installed", displayName),
 					check.WithImpact(result.ImpactBlocking),
 				)
 			}
@@ -52,7 +54,7 @@ func (c *Check) Validate(ctx context.Context, target check.Target) (*result.Diag
 				check.ConditionTypeAvailable,
 				metav1.ConditionTrue,
 				check.WithReason(check.ReasonResourceFound),
-				check.WithMessage("%s operator installed: %s", kind, version),
+				check.WithMessage("%s installed: %s", displayName, version),
 			)
 		}).
 		Run(ctx)

pkg/lint/checks/dependencies/certmanager/certmanager_test.go

@@ -112,7 +112,7 @@ func TestCertManagerCheck_Metadata(t *testing.T) {
 	certManagerCheck := certmanager.NewCheck()
 
 	g.Expect(certManagerCheck.ID()).To(Equal("dependencies.certmanager.installed"))
-	g.Expect(certManagerCheck.Name()).To(Equal("Dependencies :: CertManager :: Installed"))
+	g.Expect(certManagerCheck.Name()).To(Equal("Dependencies :: cert-manager :: Installed"))
 	g.Expect(certManagerCheck.Group()).To(Equal(check.GroupDependency))
 	g.Expect(certManagerCheck.Description()).ToNot(BeEmpty())
 }