Skip to content

PSHP-402: Update go to 1.25.12#2305

Closed
vincentdephily wants to merge 3 commits into
openshift:mainfrom
vincentdephily:vdp-go126
Closed

PSHP-402: Update go to 1.25.12#2305
vincentdephily wants to merge 3 commits into
openshift:mainfrom
vincentdephily:vdp-go126

Conversation

@vincentdephily

@vincentdephily vincentdephily commented Jul 8, 2026

Copy link
Copy Markdown

Summary by CodeRabbit

  • Bug Fixes

    • Improved error reporting when duplicate template parameters are provided, making the message clearer and more consistent.
    • Refined graph output handling so image stream details are matched and reported more accurately.
  • Chores

    • Updated the Go toolchain requirement to a newer patch version.

Miscompiles with go 1.26
It's an array, not a map. Mistake was AFAICT here from the start, but only poped up due to go 1.26
complaining about a bad format specifier.
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 8, 2026
@openshift-ci-robot

openshift-ci-robot commented Jul 8, 2026

Copy link
Copy Markdown

@vincentdephily: This pull request references PSHP-402 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 vulnerability to target the "5.0.0" version, but no target version was set.

Details

In 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.

@coderabbitai

coderabbitai Bot commented Jul 8, 2026

Copy link
Copy Markdown

Walkthrough

This PR bumps the Go toolchain version in go.mod, refactors image stream tag history iteration and log messaging in graph.go, and adjusts how duplicate template parameter errors are passed to usageErrorFn in process.go.

Changes

Miscellaneous small fixes

Layer / File(s) Summary
Go toolchain version bump
go.mod
The go directive is updated from 1.25.6 to 1.25.12.
Image stream tag iteration and logging fix
pkg/cli/admin/top/graph.go
addImageStreamsToGraph iterates over history values directly instead of (tag, history) map pairs, and the "unable to find image" log message now references history.Tag instead of the prior map key.
Duplicate parameter error formatting fix
pkg/cli/process/process.go
Duplicate-parameter handling passes a format string and joined duplicate keys as a separate argument to usageErrorFn instead of pre-formatting the message with fmt.Sprintf.

Estimated code review effort: 1 (Trivial) | ~5 minutes

Possibly related PRs

  • openshift/oc#2304: Both PRs modify the same RunProcess duplicate template-parameter error path in pkg/cli/process/process.go to pass format arguments directly instead of pre-formatting with fmt.Sprintf.

Suggested reviewers: atiratree, tchap


Important

Pre-merge checks failed

Please resolve all errors before merging. Addressing warnings is optional.

❌ Failed checks (1 error)

Check name Status Explanation Resolution
No-Sensitive-Data-In-Logs ❌ Error pkg/cli/admin/top/graph.go logs dockerImageReference and image refs, which can reveal internal registry hostnames when verbose logging is enabled. Redact image refs/registry hostnames in logs, or replace them with hashes/opaque IDs before logging.
✅ Passed checks (14 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed Only go.mod changed; no test files or Ginkgo titles were modified, so the stable test-name check is not applicable.
Test Structure And Quality ✅ Passed HEAD only changes go.mod; no *_test.go or Ginkgo specs were modified, so the test-quality checklist is not applicable.
Microshift Test Compatibility ✅ Passed The PR only updates go.mod and non-test code in graph.go; no new Ginkgo e2e tests or MicroShift-unsafe APIs were added.
Single Node Openshift (Sno) Test Compatibility ✅ Passed PR only bumps Go version and tweaks CLI code; no test files or Ginkgo specs were added or modified, so SNO compatibility isn’t implicated.
Topology-Aware Scheduling Compatibility ✅ Passed Only go.mod changed in HEAD; no deployment, controller, or scheduling/topology code was introduced.
Ote Binary Stdout Contract ✅ Passed Only go.mod changed vs parent; no process-level code or stdout writes were introduced in this PR.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed Only non-test Go files changed; no added Ginkgo e2e tests or external-network assumptions were introduced.
No-Weak-Crypto ✅ Passed PASS: The only changed file is go.mod, updating the Go version; the diff adds no MD5/SHA1/DES/RC4/3DES/Blowfish/ECB or secret comparisons.
Container-Privileges ✅ Passed Only go.mod changed; no container/K8s manifests or privilege settings were introduced.
Title check ✅ Passed The title accurately reflects the main change: bumping the Go toolchain version to 1.25.12.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

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

@openshift-ci openshift-ci Bot requested review from atiratree and tchap July 8, 2026 16:42
@openshift-ci

openshift-ci Bot commented Jul 8, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: vincentdephily
Once this PR has been reviewed and has the lgtm label, please assign ingvagabund for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🤖 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.

Inline comments:
In `@go.mod`:
- Line 3: The Go version was bumped in go.mod, but the CI root image in the
.ci-operator configuration still points to the old Go 1.25 image, so update the
CI image selection to the matching Go 1.26 release. Adjust the root image entry
in the CI config that defines the build environment (the one using
rhel-9-release-golang-1.25-openshift-4.22) so the pipeline builds and tests
against the same Go version as the module.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 06b66555-1a26-401b-bc4f-2675f272f257

📥 Commits

Reviewing files that changed from the base of the PR and between 0ec4cb0 and 24c2e81.

📒 Files selected for processing (6)
  • go.mod
  • images/cli-artifacts/Dockerfile.rhel
  • images/cli/Dockerfile.rhel
  • images/tools/Dockerfile
  • pkg/cli/admin/top/graph.go
  • pkg/cli/process/process.go

Comment thread go.mod Outdated
go1.25.7 (released 2026-02-04) includes security fixes to the go command and the crypto/tls package,
as well as bug fixes to the compiler and the crypto/x509 package. See the Go 1.25.7 milestone on our
issue tracker for details.

go1.25.8 (released 2026-03-05) includes security fixes to the html/template, net/url, and os
packages, as well as bug fixes to the go command, the compiler, and the os package. See the Go
1.25.8 milestone on our issue tracker for details.

go1.25.9 (released 2026-04-07) includes security fixes to the go command, the compiler, and the
archive/tar, crypto/tls, crypto/x509, html/template, and os packages, as well as bug fixes to the go
command, the compiler, and the runtime. See the Go 1.25.9 milestone on our issue tracker for
details.

go1.25.10 (released 2026-05-07) includes security fixes to the go command, the pack tool, and the
html/template, net, net/http, net/http/httputil, net/mail, and syscall packages, as well as bug
fixes to the go command, the compiler, the linker, the runtime, and the crypto/fips140, go/types,
and os packages. See the Go 1.25.10 milestone on our issue tracker for details.

go1.25.11 (released 2026-06-02) includes security fixes to the crypto/x509, mime, and net/textproto
packages, as well as bug fixes to the compiler and the runtime. See the Go 1.25.11 milestone on our
issue tracker for details.

go1.25.12 (released 2026-07-07) includes security fixes to the crypto/tls and os packages, as well
as bug fixes to the compiler, the go command, and the net and os packages. See the Go 1.25.12
milestone on our issue tracker for details.
@vincentdephily vincentdephily changed the title PSHP-402: Update go to 1.26 PSHP-402: Update go to 1.25.12 Jul 9, 2026
@openshift-ci

openshift-ci Bot commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

@vincentdephily: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/images 3f7f781 link true /test images
ci/prow/e2e-aws-oc-ote-serial 3f7f781 link false /test e2e-aws-oc-ote-serial
ci/prow/e2e-agent-compact-ipv4 3f7f781 link false /test e2e-agent-compact-ipv4
ci/prow/e2e-aws-ovn-serial-1of2 3f7f781 link true /test e2e-aws-ovn-serial-1of2
ci/prow/e2e-aws-ovn 3f7f781 link true /test e2e-aws-ovn
ci/prow/okd-scos-images 3f7f781 link true /test okd-scos-images
ci/prow/unit 3f7f781 link true /test unit
ci/prow/e2e-aws-ovn-serial-2of2 3f7f781 link true /test e2e-aws-ovn-serial-2of2
ci/prow/e2e-aws-ovn-upgrade 3f7f781 link true /test e2e-aws-ovn-upgrade
ci/prow/build-rpms-from-tar 3f7f781 link true /test build-rpms-from-tar
ci/prow/e2e-agnostic-ovn-cmd 3f7f781 link true /test e2e-agnostic-ovn-cmd
ci/prow/rpm-build 3f7f781 link true /test rpm-build
ci/prow/verify 3f7f781 link true /test verify
ci/prow/e2e-aws-oc-ote 3f7f781 link false /test e2e-aws-oc-ote
ci/prow/verify-deps 3f7f781 link true /test verify-deps

Full PR test history. Your PR dashboard.

Details

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 kubernetes-sigs/prow repository. I understand the commands that are listed here.

@vincentdephily

Copy link
Copy Markdown
Author

Closing this for now:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants