From 385e7498c45bfae4835d09c5360d72f3241c5c48 Mon Sep 17 00:00:00 2001 From: Vincent de Phily Date: Wed, 8 Jul 2026 17:00:46 +0100 Subject: [PATCH 1/3] PSHP-402: Fix usageErrorFn arguments Miscompiles with go 1.26 --- pkg/cli/process/process.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cli/process/process.go b/pkg/cli/process/process.go index 09c561c992..23a1540b14 100644 --- a/pkg/cli/process/process.go +++ b/pkg/cli/process/process.go @@ -312,7 +312,7 @@ func (o *ProcessOptions) RunProcess() error { return nil }) if len(duplicatedKeys) != 0 { - return o.usageErrorFn(fmt.Sprintf("The following parameters were provided more than once: %s", strings.Join(duplicatedKeys.List(), ", "))) + return o.usageErrorFn("The following parameters were provided more than once: %s", strings.Join(duplicatedKeys.List(), ", ")) } if len(o.templateName) == 0 && len(o.filename) == 0 { From c1a39759cd280e6c0d5693fc0751e8046af627e7 Mon Sep 17 00:00:00 2001 From: Vincent de Phily Date: Wed, 8 Jul 2026 17:13:21 +0100 Subject: [PATCH 2/3] PSHP-402: Fix iterating over stream.Status.Tags 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. --- pkg/cli/admin/top/graph.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/cli/admin/top/graph.go b/pkg/cli/admin/top/graph.go index 5ff9ceafb9..671f929a84 100644 --- a/pkg/cli/admin/top/graph.go +++ b/pkg/cli/admin/top/graph.go @@ -68,13 +68,12 @@ func addImageStreamsToGraph(g genericgraph.Graph, streams *imagev1.ImageStreamLi imageStreamNode := isNode.(*imagegraph.ImageStreamNode) // connect IS with underlying images - for tag, history := range stream.Status.Tags { - for i := range history.Items { - image := history.Items[i] + for _, history := range stream.Status.Tags { + for i, image := range history.Items { imageNode := imagegraph.FindImage(g, image.Image) if imageNode == nil { klog.V(2).Infof("Unable to find image %q in graph (from tag=%q, dockerImageReference=%s)", - history.Items[i].Image, tag, image.DockerImageReference) + history.Items[i].Image, history.Tag, image.DockerImageReference) continue } klog.V(4).Infof("Adding edge from %q to %q", imageStreamNode.UniqueName(), imageNode.UniqueName()) From 3f7f781dadb65493c6d6b8dd4ec18af5b364358d Mon Sep 17 00:00:00 2001 From: Vincent de Phily Date: Thu, 9 Jul 2026 11:12:00 +0100 Subject: [PATCH 3/3] PSHP-402: Bump go version 1.25.6 -> 1.25.12 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. --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 9dbc7cdf97..c0969d5cc8 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/openshift/oc -go 1.25.6 +go 1.25.12 require ( al.essio.dev/pkg/shellescape v1.6.0