Skip to content

CNTRLPLANE-3553: getRHELStream returns rhel-9 for pre-5.0 releases #2046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sdminonne wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −3
Open

CNTRLPLANE-3553: getRHELStream returns rhel-9 for pre-5.0 releases #2046

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions enhancements/hypershift/dual-stream-rhel-nodepool.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,10 +379,13 @@ Implementation steps:
- **Explicit value set** → return it as-is
- **Unset + release >= 5.0 + runc** → return `"rhel-9"` (fallback)
- **Unset + release >= 5.0** → return `"rhel-10"` (default)
- **Unset + release < 5.0** → return `""` (no stream, legacy behavior)
- **Unset + release < 5.0** → return `"rhel-9"`

When the function returns `""`, the system uses the existing single-stream code path — no OSImageStream CR is generated,
no stream is included in the hash, and the MCC uses `BaseOSContainerImage` from ControllerConfig as-is.
Returning an explicit `"rhel-9"` for pre-5.0 releases (rather than an empty string) ensures that
downstream consumers such as `StreamForName()` always receive a concrete stream name. This avoids
errors when the legacy `StreamMetadata` field is eventually removed (> 5.3). The hash normalization
in `NewConfigGenerator` keeps `rolloutConfig.rhelStream` empty when the resolved stream matches the
version-derived default, so returning `"rhel-9"` here does not cause spurious rollouts.

3. **Call `getRHELStream()` from `NewToken()`** — `NewToken()` (`token.go`) already receives the `ConfigGenerator`
(which has `usesRunc` and `releaseImage.Version()`), and has access to the NodePool spec.
Expand Down