update: odh-cli across code base

- update Makefile for the final image
- update README with usage and image

Signed-off-by: Wen Zhou <wenzhou@redhat.com>

Author: zdtsw

Dockerfile

@@ -67,34 +67,22 @@ RUN python3 -m pip install --no-cache-dir \
     'kubernetes>=28.1.0' \
     'PyYAML>=6.0'
 
-# Install kubectl with multi-arch support (latest stable version)
-RUN set -e; \
-    ARCH=${TARGETARCH:-amd64}; \
-    case "$ARCH" in \
-        amd64) KUBE_ARCH="amd64" ;; \
-        arm64) KUBE_ARCH="arm64" ;; \
-        *) echo "Unsupported architecture: $ARCH" >&2; exit 1 ;; \
-    esac; \
-    echo "Installing kubectl for architecture: $KUBE_ARCH"; \
-    curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/${KUBE_ARCH}/kubectl"; \
-    chmod +x kubectl; \
-    mv kubectl /usr/local/bin/kubectl
-
-# Install OpenShift CLI (oc) with multi-arch support (stable version)
+# Install OpenShift CLI (oc) and kubectl with multi-arch support
 RUN set -e; \
     ARCH=${TARGETARCH:-amd64}; \
     case "$ARCH" in \
         amd64) OC_ARCH="amd64" ;; \
         arm64) OC_ARCH="arm64" ;; \
         *) echo "Unsupported architecture: $ARCH" >&2; exit 1 ;; \
     esac; \
-    echo "Installing oc for architecture: $OC_ARCH"; \
+    echo "Installing oc and kubectl for architecture: $OC_ARCH"; \
     curl -fsSL -o openshift-client.tar.gz \
-        "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable-4.17/openshift-client-linux-${OC_ARCH}-rhel9.tar.gz"; \
+        "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable-4.19/openshift-client-linux-${OC_ARCH}-rhel9.tar.gz"; \
     tar -xzf openshift-client.tar.gz; \
-    chmod +x oc; \
+    chmod +x oc kubectl; \
     mv oc /usr/local/bin/oc; \
-    rm -f openshift-client.tar.gz kubectl README.md
+    mv kubectl /usr/local/bin/kubectl; \
+    rm -f openshift-client.tar.gz README.md
 
 # Install yq with multi-arch support (stable version)
 RUN set -e; \
@@ -111,18 +99,19 @@ RUN set -e; \
     chmod +x /usr/local/bin/yq
 
 # Copy binary from builder (cross-compiled for target platform)
-COPY --from=builder /workspace/bin/kubectl-odh /opt/rhai-cli/bin/rhai-cli
+COPY --from=builder /workspace/bin/odh-cli /opt/odh-cli/bin/odh-cli
 
-# Add rhai-cli to PATH
-ENV PATH="/opt/rhai-cli/bin:${PATH}"
+# Add odh-cli to PATH
+ENV PATH="/opt/odh-cli/bin:${PATH}"
 
 # Copy upgrade helpers from builder
 COPY --from=builder /opt/rhai-upgrade-helpers /opt/rhai-upgrade-helpers
 
 # Create backup directory for upgrade artifacts (world-writable with sticky bit
 # so arbitrary UIDs can create subdirectories without permission errors)
+# This is path is created by https://github.com/red-hat-data-services/rhoai-upgrade-helpers
 RUN mkdir -p /tmp/rhoai-upgrade-backup && chmod 1777 /tmp/rhoai-upgrade-backup
 
-# Set entrypoint to rhai-cli binary
+# Set entrypoint to odh-cli binary
 # Users can override with --entrypoint /bin/bash for interactive debugging
-ENTRYPOINT ["/opt/rhai-cli/bin/rhai-cli"]
+ENTRYPOINT ["/opt/odh-cli/bin/odh-cli"]

Makefile

@@ -1,7 +1,7 @@
-# kubectl-odh CLI Makefile
+# odh-cli Makefile
 
 # Binary name
-BINARY_NAME=bin/kubectl-odh
+BINARY_NAME=bin/odh-cli
 
 # Version information
 VERSION ?= $(shell git describe --tags --always --dirty 2>/dev/null || echo "dev")
@@ -18,7 +18,7 @@ LINT_TIMEOUT := 10m
 
 # Container registry configuration
 CONTAINER_REGISTRY ?= quay.io
-CONTAINER_REPO ?= $(CONTAINER_REGISTRY)/rhoai/rhoai-upgrade-helpers-rhel9
+CONTAINER_REPO ?= $(CONTAINER_REGISTRY)/opendatahub-io/odh-cli-rhel9
 CONTAINER_PLATFORMS ?= linux/amd64,linux/arm64
 CONTAINER_TAGS ?= $(VERSION)
 
@@ -122,7 +122,7 @@ publish: build-image
 .PHONY: help
 help:
 	@echo "Available targets:"
-	@echo "  build       - Build the kubectl-odh binary"
+	@echo "  build       - Build the odh-cli binary"
 	@echo "  build-image - Build container image without pushing (creates local manifest)"
 	@echo "  publish     - Build and push container image using Podman manifest"
 	@echo "  run         - Run the doctor command"

README.md

@@ -1,113 +1,165 @@
 # odh-cli
 
-CLI tool for RHOAI (Red Hat OpenShift AI) for interacting with RHOAI deployments on Kubernetes.
+CLI tool for ODH/RHOAI (Red Hat OpenShift AI) for interacting with ODH/RHOAI deployments on Kubernetes.
+
+## Available Subcommands
+
+- **`odh-cli lint`** - Validate cluster configuration and assess upgrade readiness
+- **`odh-cli version`** - Display CLI version information
 
 ## Quick Start
 
 ### Using Containers
 
-Run the CLI using the pre-built container image:
+Run the CLI using the pre-built container image. Set your container runtime (podman or docker):
 
-**Podman:**
 ```bash
-podman run --rm -ti \
-  -v $KUBECONFIG:/kubeconfig \
-  quay.io/rhoai/rhoai-upgrade-helpers-rhel9:dev lint --target-version 3.3.0
-```
+# Use podman or docker
+CONTAINER_TOOL=podman  # or 'docker'
 
-**Docker:**
-```bash
-docker run --rm -ti \
+# Run lint command
+$CONTAINER_TOOL run --rm -ti \
   -v $KUBECONFIG:/kubeconfig \
-  quay.io/rhoai/rhoai-upgrade-helpers-rhel9:dev lint --target-version 3.3.0
+  quay.io/rhoai/odh-cli-rhel9:dev lint --target-version 3.3.0
 ```
 
 The container has `KUBECONFIG=/kubeconfig` set by default, so you just need to mount your kubeconfig to that path.
 
-> **SELinux:** On systems with SELinux enabled (Fedora, RHEL, CentOS), add `:Z` to the volume mount:
+> **Note:** If `KUBECONFIG` is not set, use the default path:
 > ```bash
-> # Podman
-> podman run --rm -ti \
+> $CONTAINER_TOOL run --rm -ti \
+>   -v ~/.kube/config:/kubeconfig \
+>   quay.io/rhoai/odh-cli-rhel9:dev lint --target-version 3.3.0
+> ```
+
+> **SELinux:** On SELinux systems (Fedora, RHEL, CentOS), add `:Z` to volume mounts:
+> ```bash
+> # With KUBECONFIG set
+> $CONTAINER_TOOL run --rm -ti \
 >   -v $KUBECONFIG:/kubeconfig:Z \
->   quay.io/rhoai/rhoai-upgrade-helpers-rhel9:dev lint --target-version 3.3.0
+>   quay.io/rhoai/odh-cli-rhel9:dev lint --target-version 3.3.0
 >
-> # Docker
-> docker run --rm -ti \
->   -v $KUBECONFIG:/kubeconfig:Z \
->   quay.io/rhoai/rhoai-upgrade-helpers-rhel9:dev lint --target-version 3.3.0
+> # With default kubeconfig path
+> $CONTAINER_TOOL run --rm -ti \
+>   -v ~/.kube/config:/kubeconfig:Z \
+>   quay.io/rhoai/odh-cli-rhel9:dev lint --target-version 3.3.0
 > ```
 
+**Working with Multiple Clusters:**
+
+If your kubeconfig contains multiple cluster contexts, the CLI uses the `current-context`. You have two options:
+
+**Option 1: Switch context before running (Recommended)**
+
+```bash
+# Switch to desired cluster
+kubectl config use-context <context-name>
+
+# Run the CLI (uses new context-name)
+$CONTAINER_TOOL run --rm -ti \
+  -v ~/.kube/config:/kubeconfig \
+  quay.io/rhoai/odh-cli-rhel9:dev lint --target-version 3.3.0
+```
+
+**Option 2: Set context with --context flag**
+
+```bash
+$CONTAINER_TOOL run --rm -ti \
+  -v ~/.kube/config:/kubeconfig:Z \
+  quay.io/rhoai/odh-cli-rhel9:dev lint --target-version 3.3.0 \
+  --context <context-name>
+```
+
 **Available Tags:**
-- `:latest` - Latest stable release
-- `:dev` - Latest development build from main branch (updated on every push)
-- `:vX.Y.Z` - Specific version (e.g., `:v1.2.3`)
+- `:dev` - Latest development build from main branch
+- `:rhoai-X.Y-ea.Z` - Specific version (e.g., `:rhoai-3.4-ea.1`)
 
-> **Note:** The images are OCI-compliant and work with both Podman and Docker. Examples for both are provided below.
+> **Note:** The images are OCI-compliant and work with both Podman and Docker.
 
-**Shell Access:**
+**Interactive Shell Access:**
 
-The container also bundles migration tools and CLI utilities that can be used directly from a shell session:
+For interactive debugging and running upgrade helper scripts:
 
-**Podman:**
+**Step 1: Login to cluster (on your host)**
 ```bash
-podman run -it --rm \
-  -v $KUBECONFIG:/kubeconfig \
-  --entrypoint /bin/bash \
-  quay.io/rhoai/rhoai-upgrade-helpers-rhel9:dev
+# Login on your cluster which should  update ~/.kube/config
+oc login --token=sha256~xxxx --server=https://api.my-cluster.example.com:6443
 ```
 
-**Docker:**
+**Step 2: Shell into container**
 ```bash
-docker run -it --rm \
-  -v $KUBECONFIG:/kubeconfig \
+# Mount the kubeconfig that was created by oc login
+$CONTAINER_TOOL run -it --rm \
+  -v ~/.kube/config:/kubeconfig \
   --entrypoint /bin/bash \
-  quay.io/rhoai/rhoai-upgrade-helpers-rhel9:dev
+  quay.io/rhoai/odh-cli-rhel9:dev
 ```
 
+**Step 3: Inside container - you're already authenticated**
+
 Available tools:
-- `rhai-cli`
-- `kubectl` (latest stable)
-- `oc` (latest stable)
-- `jq`
-- `wget`
-- `curl`
-- `tar`
-- `gzip`
-- `bash`
-
-Example usage:
-```bash
-oc login --token=sha256~xxxx --server=https://api.my-cluster.p3.openshiftapps.com:6443
+- `odh-cli` - The CLI tool (at `/opt/odh-cli/bin/odh-cli`)
+- `kubectl` / `oc` - Kubernetes/OpenShift client tools from OCP 4.19
+- Upgrade helper scripts at `/opt/rhai-upgrade-helpers`
+- Standard utilities: `jq`, `yq`, `python3`, `wget`, `curl`, `tar`, `gzip`, `bash`
 
-kubectl get pods -n opendatahub
+Example workflow:
+```bash
+# Verify connection
 oc get dsci
 
-rhai-cli lint --target-version 3.3.0
+# Run lint command
+odh-cli lint --target-version 3.3.0
+
+# Example: Run upgrade helper script
+cd /opt/rhai-upgrade-helpers
+./ray/ray_cluster_migration.py backup
 ```
 
-The `rhai-cli` binary is located at `/opt/rhai-cli/bin/rhai-cli` (already on `PATH`).
-Upgrade helper scripts are located at `/opt/rhai-upgrade-helpers`.
+**Using Upgrade Helper Scripts:**
 
-**Token Authentication:**
+The lint command identifies upgrade issues and provides remediation steps that reference upgrade helper scripts. Follow this workflow:
 
-For environments where you have a token and server URL instead of a kubeconfig file:
+**Step 1: Run lint to identify issues**
+```bash
+$CONTAINER_TOOL run --rm -ti \
+  -v ~/.kube/config:/kubeconfig \
+  quay.io/rhoai/odh-cli-rhel9:dev lint --target-version 3.3.0
+```
 
-**Podman:**
+**Step 2: Review remediation guidance**
+
+Lint output shows which helper scripts to run:
+```
+CHECK: Ray workloads migration
+REMEDIATION: Run ray_cluster_migration.py from rhoai-upgrade-helpers repository
+```
+
+**Step 3: Run helper scripts in shell mode**
+
+Shell into the container with backup directory mounted:
 ```bash
-podman run --rm -ti \
-  quay.io/rhoai/rhoai-upgrade-helpers-rhel9:dev \
-  lint \
-  --target-version 3.3.0 \
-  --token=sha256~xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
-  --server=https://api.my-cluster.p3.openshiftapps.com:6443
+$CONTAINER_TOOL run -it --rm \
+  -v ~/.kube/config:/kubeconfig:Z \
+  -v ./backup:/tmp/rhoai-upgrade-backup:Z \
+  --entrypoint /bin/bash quay.io/rhoai/odh-cli-rhel9:dev
+
+# Inside container - run the recommended script
+cd /opt/rhai-upgrade-helpers
+./ray/ray_cluster_migration.py backup
+./trustyai/backup-metrics.sh
 ```
 
-**Docker:**
+Scripts write backups to `/tmp/rhoai-upgrade-backup/<component>/` which persists to `./backup/` on your localhost via the volume mount.
+
+**Token Authentication:**
+
+For environments with token and server URL (no kubeconfig file):
+
 ```bash
-docker run --rm -ti \
-  quay.io/rhoai/rhoai-upgrade-helpers-rhel9:dev \
-  lint \
-  --target-version 3.3.0 \
+$CONTAINER_TOOL run --rm -ti \
+  quay.io/rhoai/odh-cli-rhel9:dev \
+  lint --target-version 3.3.0 \
   --token=sha256~xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
   --server=https://api.my-cluster.p3.openshiftapps.com:6443
 ```
@@ -120,4 +172,3 @@ For detailed documentation, see:
 - [Development Guide](docs/development.md)
 - [Lint Architecture](docs/lint/architecture.md)
 - [Writing Lint Checks](docs/lint/writing-checks.md)
-

cmd/main.go

@@ -15,7 +15,7 @@ func main() {
 	flags := genericclioptions.NewConfigFlags(true).WithDeprecatedPasswordFlag()
 
 	cmd := &cobra.Command{
-		Use:   "kubectl-odh",
+		Use:   "odh-cli",
 		Short: "kubectl plugin for ODH/RHOAI",
 	}
 

cmd/version/version.go

@@ -44,7 +44,7 @@ func AddCommand(root *cobra.Command, _ *genericclioptions.ConfigFlags) {
 			default:
 				_, err := fmt.Fprintf(
 					cmd.OutOrStdout(),
-					"kubectl-odh version %s (commit: %s, built: %s)\n",
+					"odh-cli version %s (commit: %s, built: %s)\n",
 					version.GetVersion(),
 					version.GetCommit(),
 					version.GetDate(),