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 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()) 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 {