Temporary 1.36 image fixes (revert in rebase PR)#31263
Conversation
|
Pipeline controller notification For optional jobs, comment This repository is configured in: automatic mode |
|
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: Enterprise Run ID: ⛔ Files ignored due to path filters (1)
📒 Files selected for processing (1)
🚧 Files skipped from review as they are similar to previous changes (1)
WalkthroughThe PR appends a hardcoded glibc-dns-testing image mirror mapping to the images command output by calling a new helper that returns sorted, conditionally-formatted mapping lines, which are printed after the main mirror list. ChangesImage Mirror Injection
Estimated code review effort🎯 2 (Simple) | ⏱️ ~10 minutes 🚥 Pre-merge checks | ✅ 14 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (14 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: jacobsee 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 |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
🧹 Nitpick comments (1)
pkg/cmd/openshift-tests/images/images_command.go (1)
104-108: ⚡ Quick winConsider maintaining global sort order for the complete output.
The main mirror list is sorted at line 276, but the injected lines are sorted separately and appended afterward. This results in two sorted chunks rather than a globally sorted output. While the current grep-based consumers (e.g.,
hack/update-generated.sh) should handle this, tools expecting fully sorted mirror mappings may be affected.♻️ Merge and sort all lines together
- for _, line := range lines { - fmt.Fprintln(os.Stdout, line) - } - // TODO(k8s-1.36): remove this when k8s 1.36 lands injectedLines := injectNewImages(ref, !o.Upstream) - for _, line := range injectedLines { - fmt.Fprintln(os.Stdout, line) - } + lines = append(lines, injectedLines...) + sort.Strings(lines) + + for _, line := range lines { + fmt.Fprintln(os.Stdout, line) + }🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@pkg/cmd/openshift-tests/images/images_command.go` around lines 104 - 108, The injected lines are generated by injectNewImages into injectedLines and printed immediately (fmt.Fprintln(os.Stdout,...)), which causes two separately-sorted chunks; instead, append injectedLines into the main list of mirror lines before the global sort step and perform a single sort so the entire output is globally ordered; modify the code path that currently prints injectedLines to return or append those strings to the existing slice used for the main mirror list sorting and then call the same sort and final output writer (instead of printing early) so the combined slice is sorted and emitted together.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Nitpick comments:
In `@pkg/cmd/openshift-tests/images/images_command.go`:
- Around line 104-108: The injected lines are generated by injectNewImages into
injectedLines and printed immediately (fmt.Fprintln(os.Stdout,...)), which
causes two separately-sorted chunks; instead, append injectedLines into the main
list of mirror lines before the global sort step and perform a single sort so
the entire output is globally ordered; modify the code path that currently
prints injectedLines to return or append those strings to the existing slice
used for the main mirror list sorting and then call the same sort and final
output writer (instead of printing early) so the combined slice is sorted and
emitted together.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Central YAML (inherited)
Review profile: CHILL
Plan: Enterprise
Run ID: 2a715230-9b0f-4594-8386-3806b27b1c90
⛔ Files ignored due to path filters (1)
test/extended/util/image/zz_generated.txtis excluded by!**/zz_generated*
📒 Files selected for processing (1)
pkg/cmd/openshift-tests/images/images_command.go
openshift-ci
Bot
added
the
ready-for-human-review
|
Scheduling required tests: |
|
/retest |
|
Job Failure Risk Analysis for sha: ae82451
|
…ng 1.36 before the openshift/origin PR has merged.
jacobsee
force-pushed
the
temp-fix-1.36-dnsutils-image
branch
from
ae82451 to
64e79b7
Compare
|
Scheduling required tests: |
|
/test e2e-gcp-ovn |
|
/test e2e-vsphere-ovn |
|
@jacobsee: 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. |
2 participants
Temporarily map the glibc-dns-testing image to jessie-dnsutils while we're payload testing 1.36 before the openshift/origin PR has merged. Should be reverted when that happens.
Summary by CodeRabbit