Skip to content

CARRY: fix(skills): move ODH installer guidance out of upstream skill - #124

Merged
EmilienM merged 1 commit into
mainfrom
fix/skill-sync-conflict/andre-motta
Oct 23, 2026
Merged

EmilienM merged 1 commit into
mainfrom
fix/skill-sync-conflict/andre-motta

Conversation

@andre-motta

@andre-motta andre-motta commented Oct 23, 2026 •

Copy link
Copy Markdown
Member

Summary

The upstream auto-merge failed with a conflict in skills/debug-openshell-cluster/SKILL.md (rhods-devops-infra run 39951574868). Midstream carried an ODH installer block inside that upstream-owned file, and an earlier sync merge kept a stale midstream table row, so upstream NVIDIA#4702 conflicted with it. This moves the ODH guidance into a midstream-only skill and makes debug-openshell-cluster identical to upstream so future syncs merge it cleanly.

Related Issue

The target repository (opendatahub-io/openshell) has GitHub Issues disabled, so there is no target-repository issue to close.

Changes

Testing

  • Simulated merge of upstream/main (9a85667) into this branch completes without conflicts
  • After the simulated merge, SKILL.md matches upstream/main
  • markdownlint-cli2 and scripts/update_license_headers.py --check pass

Checklist

  • Follows Conventional Commits
  • Commits are signed off (DCO)
  • Architecture docs updated (if applicable)

🤖 Generated with Claude Code

Summary by CodeRabbit

  • Documentation
    • Added troubleshooting guidance for ODH/RHOAI OpenShell gateway and dashboard installations, covering installation state, credentials, Routes, login, and sandbox readiness.
    • Updated sandbox startup guidance to address UID/GID range conflicts and incompatible security-context overrides, replacing the previous privileged SCC recommendation.
    • Moved ODH/RHOAI installation troubleshooting details out of the general OpenShell cluster guide; it now focuses on cluster and sandbox startup issues.

Keep debug-openshell-cluster identical to upstream so the upstream sync stops conflicting, and move the ODH installer guidance into a midstream-only debug-odh-openshell-install skill.

Signed-off-by: Andre Lustosa <alustosa@redhat.com>
@coderabbitai

coderabbitai Bot commented Oct 23, 2026

Copy link
Copy Markdown

Note

Currently processing new changes in this PR. This may take a few minutes, please wait...

⚙️ Run configuration
  • Source mode: Auto
  • Repository: Unavailable
  • Branch: Unavailable
  • File: No configuration file from this repository applied
  • Commit: Unavailable
  • Layers: Central YAML (base), Organization UI (inherited)
  • Review profile: CHILL
  • Plan: Enterprise
  • Run ID: 55614aaa-d731-4af5-90f1-baa7151d5e4c
📥 Commits

Reviewing files that changed from the base of the PR and between 60e6434 and 6b32278.

📒 Files selected for processing: 2
  • skills/debug-odh-openshell-install/SKILL.md
  • skills/debug-openshell-cluster/SKILL.md
+----------------------------------------------------------------------------------------------------------------------------------------+
| Use saboteurs to test your testing. Introduce bugs on purpose in a separate copy of the source to verify that testing will catch them. |
+----------------------------------------------------------------------------------------------------------------------------------------+
  \
   \     /)/)
        ( '')
        /  |
      o(___)

Comment @coderabbitai help to get the list of available commands.

@EmilienM
EmilienM merged commit 38fc5c2 into main Oct 23, 2026
23 of 24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants