OKD-443: Fix pre-OSImageStreams node OS validation for OKD - #31621
OKD-443: Fix pre-OSImageStreams node OS validation for OKD#31621pskrbasu wants to merge 1 commit into
Conversation
The validatePreOSImageStreamsNodeOS function hardcoded a check for "CoreOS 9." which is correct for OCP but wrong for OKD, which was already using CoreOS 10 in pre-OSImageStreams versions like 4.22. This caused the "prow job name should match os version" test to fail during 4.22→5.0 OKD upgrades: the test correctly identified the cluster as pre-OSImageStreams (< 4.23) but then failed because the nodes were running CentOS Stream CoreOS 10, not CoreOS 9. Make validatePreOSImageStreamsNodeOS OKD-aware by accepting an isOKD parameter and checking CoreOS 10 for OKD clusters. OCP behavior is unchanged.
|
Pipeline controller notification For optional jobs, comment This repository is configured in: automatic mode |
|
@pskrbasu: This pull request references OKD-443 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "5.1.0" version, but no target version was set. DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Repository YAML (base), Central YAML (inherited) Review profile: CHILL Plan: Advanced Run ID: 📒 Files selected for processing (1)
Included review availability: Your plan provides up to 8 included reviews per hour; 7 remain after this review. WalkthroughThe pre-OSImageStreams node OS validation now selects CoreOS 10 for OKD clusters and CoreOS 9 for other clusters. The standalone node OS validation passes the cluster type to the updated validator. ChangesNode OS validation
Estimated code review effort: 2 (Simple) | ~10 minutes Merge Risk: ⚪ Minimal · up to This updates OKD pre-OSImageStreams validation to expect CoreOS 10 while preserving CoreOS 9 validation for OCP. No current merge-blocking risk is evident. Suggested reviewers: 🚥 Pre-merge checks | ✅ 14 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (14 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
|
Scheduling required tests: |
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: pablintino, pskrbasu The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
@pskrbasu: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
|
/cc @miyadav |
Summary
validatePreOSImageStreamsNodeOSOKD-aware: check CoreOS 10 for OKD clusters instead of hardcoding CoreOS 9[sig-ci] [Early] prow job name should match os versiontest failure during 4.22→5.x OKD upgradesDetails
The
validatePreOSImageStreamsNodeOSfunction hardcoded"CoreOS 9."which is correct for OCP (RHEL 9) but wrong for OKD, which was already using CoreOS 10 in pre-OSImageStreams versions like 4.22. During 4.22→5.0 OKD upgrades, the test correctly identified the cluster as pre-OSImageStreams (< 4.23) but then failed because the nodes were running CentOS Stream CoreOS 10, not CoreOS 9.This is the
mainbranch counterpart of openshift/origin#31592 (targetingrelease-5.0). The change is identical.OCP behavior is unchanged —
isOKDis false for OCP clusters, sotargetVersionremains 9.Test plan
go vetpassesReferences
release-5.0Summary by CodeRabbit