CORENET-7046: Bump Kubernetes to 1.36.2 and OCP to 5.0 #3017
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| build_root_image: | ||
| name: release | ||
| namespace: openshift | ||
| tag: rhel-9-release-golang-1.26-openshift-5.0 | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,38 @@ | ||
| module github.com/openshift/cluster-network-operator | ||
|
|
||
| go 1.26.0 | ||
|
|
||
| require ( | ||
| github.com/Masterminds/semver v1.5.0 | ||
| github.com/Masterminds/sprig/v3 v3.2.3 | ||
| github.com/containernetworking/cni v0.8.0 | ||
|
There was a problem hiding this comment. 🧩 Analysis chain🏁 Script executed: #!/bin/bash
set -euo pipefail
# Verify vulnerability status from OSV for the exact module+version in go.mod
curl -s https://api.osv.dev/v1/query \
-H 'Content-Type: application/json' \
-d '{
"package": {"name":"github.com/containernetworking/cni","ecosystem":"Go"},
"version":"0.8.0"
}' | jq '{vulns: [.vulns[]?.id], summary: [.vulns[]?.summary]}'Repository: openshift/cluster-network-operator Length of output: 306 🏁 Script executed: #!/bin/bash
set -euo pipefail
curl -s https://api.osv.dev/v1/query \
-H 'Content-Type: application/json' \
-d '{
"package": {"name":"github.com/containernetworking/cni","ecosystem":"Go"},
"version":"0.8.0"
}' \
| jq '{
vulns: [.vulns[]?.id],
details: [.vulns[]? | {id, summary, fixed: .fixed?, references: (.references // [])}],
affected: [.vulns[]? | .affected?]
}'Repository: openshift/cluster-network-operator Length of output: 3252 Flag vulnerable Go dependency: bump github.com/containernetworking/cni v0.8.0Please bump to 🧰 Tools🪛 OSV Scanner (2.3.8)[HIGH] 8-8: github.com/containernetworking/cni 0.8.0: Improper limitation of path name in github.com/containernetworking/cni (GO-2022-0230) [HIGH] 8-8: github.com/containernetworking/cni 0.8.0: containernetworking/cni improper limitation of path name 🤖 Prompt for AI Agents |
||
| github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 | ||
| github.com/go-bindata/go-bindata v3.1.2+incompatible | ||
| github.com/onsi/gomega v1.40.0 | ||
| github.com/openshift/build-machinery-go v0.0.0-20260427155009-b879704ce51f | ||
| github.com/pkg/errors v0.9.1 | ||
| github.com/prometheus/client_golang v1.23.2 | ||
| github.com/spf13/cobra v1.10.2 | ||
| github.com/spf13/pflag v1.0.10 | ||
| github.com/stretchr/testify v1.11.1 | ||
| github.com/vishvananda/netlink v1.1.0 | ||
| github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae // indirect | ||
| golang.org/x/net v0.55.0 | ||
| gopkg.in/yaml.v2 v2.4.0 | ||
| k8s.io/api v0.36.2 | ||
| k8s.io/apimachinery v0.36.2 | ||
| k8s.io/code-generator v0.36.2 | ||
| k8s.io/component-base v0.36.2 | ||
| k8s.io/klog/v2 v2.140.0 | ||
| k8s.io/kube-proxy v0.36.2 | ||
| k8s.io/utils v0.0.0-20260507154919-ff6756f316d2 | ||
| sigs.k8s.io/controller-runtime v0.24.1 | ||
| ) | ||
|
|
||
| // Use openshift/library-go PR #2171 until it merges, because it carries the | ||
| // Kubernetes 1.36 HasSyncedChecker fake informer fix and Go 1.26 vet fixes. | ||
| replace github.com/openshift/library-go => github.com/jubittajohn/library-go v0.0.0-20260529005742-3c9df83aa03b | ||
|
coderabbitai[bot] marked this conversation as resolved.
|
||
|
|
||
| require ( | ||
| github.com/Masterminds/goutils v1.1.1 // indirect | ||
| github.com/NYTimes/gziphandler v1.1.1 // indirect | ||
|
|
@@ -39,16 +43,15 @@ require ( | |
| github.com/coreos/go-systemd/v22 v22.7.0 // indirect | ||
| github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect | ||
| github.com/felixge/httpsnoop v1.0.4 // indirect | ||
| github.com/fsnotify/fsnotify v1.10.1 // indirect | ||
| github.com/go-logr/logr v1.4.3 // indirect | ||
| github.com/go-openapi/jsonpointer v0.23.1 // indirect | ||
| github.com/go-openapi/jsonreference v0.21.5 // indirect | ||
| github.com/go-openapi/swag v0.26.0 // indirect | ||
| github.com/gogo/protobuf v1.3.2 // indirect | ||
| github.com/golang/protobuf v1.5.4 // indirect | ||
| github.com/google/go-cmp v0.7.0 // indirect | ||
| github.com/google/uuid v1.6.0 // indirect | ||
| github.com/huandu/xstrings v1.4.0 // indirect | ||
| github.com/imdario/mergo v0.3.16 // indirect | ||
| github.com/inconshreveable/mousetrap v1.1.0 // indirect | ||
|
|
@@ -61,7 +64,7 @@ require ( | |
| github.com/pkg/profile v1.7.0 // indirect | ||
| github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect | ||
| github.com/prometheus/client_model v0.6.2 // indirect | ||
| github.com/prometheus/common v0.68.0 // indirect | ||
| github.com/prometheus/procfs v0.20.1 // indirect | ||
| github.com/robfig/cron v1.2.0 // indirect | ||
| github.com/sirupsen/logrus v1.9.4 // indirect | ||
|
|
@@ -76,88 +79,91 @@ require ( | |
| go.opentelemetry.io/otel/trace v1.41.0 // indirect | ||
| go.opentelemetry.io/proto/otlp v1.9.0 // indirect | ||
| go.uber.org/multierr v1.11.0 // indirect | ||
| go.uber.org/zap v1.28.0 // indirect | ||
| golang.org/x/crypto v0.51.0 // indirect | ||
| golang.org/x/mod v0.36.0 // indirect | ||
| golang.org/x/oauth2 v0.36.0 // indirect | ||
| golang.org/x/sync v0.20.0 // indirect | ||
| golang.org/x/sys v0.45.0 // indirect | ||
| golang.org/x/term v0.43.0 // indirect | ||
| golang.org/x/text v0.37.0 // indirect | ||
| golang.org/x/time v0.15.0 // indirect | ||
| golang.org/x/tools v0.45.0 // indirect | ||
| gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect | ||
| google.golang.org/grpc v1.80.0 // indirect | ||
| google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af // indirect | ||
| gopkg.in/inf.v0 v0.9.1 // indirect | ||
| gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect | ||
| gopkg.in/yaml.v3 v3.0.1 // indirect | ||
| k8s.io/kube-openapi v0.0.0-20260520065146-aa012df4f4af // indirect | ||
| sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.35.0 // indirect | ||
| sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect | ||
| sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 // indirect | ||
| sigs.k8s.io/yaml v1.6.0 // indirect | ||
| ) | ||
|
|
||
| require ( | ||
| github.com/openshift/api v0.0.0-20260528061300-9f553042f9ae | ||
| github.com/openshift/client-go v0.0.0-20260512113608-deb4dc54551a | ||
| github.com/openshift/library-go v0.0.0-20260528084301-c7d432293c13 | ||
| github.com/openshift/machine-config-operator v0.0.1-0.20250724162154-ab14c8e2843b | ||
| k8s.io/apiextensions-apiserver v0.36.2 | ||
| k8s.io/client-go v0.36.2 | ||
| sigs.k8s.io/controller-tools v0.21.0 | ||
| ) | ||
|
|
||
| require ( | ||
| cel.dev/expr v0.25.1 // indirect | ||
| github.com/Masterminds/semver/v3 v3.5.0 // indirect | ||
| github.com/antlr4-go/antlr/v4 v4.13.1 // indirect | ||
| github.com/cenkalti/backoff/v5 v5.0.3 // indirect | ||
| github.com/emicklei/go-restful/v3 v3.13.0 // indirect | ||
| github.com/evanphx/json-patch/v5 v5.9.11 // indirect | ||
| github.com/fatih/color v1.19.0 // indirect | ||
| github.com/felixge/fgprof v0.9.4 // indirect | ||
| github.com/fxamacker/cbor/v2 v2.9.2 // indirect | ||
| github.com/go-logr/stdr v1.2.2 // indirect | ||
| github.com/go-openapi/swag/cmdutils v0.26.0 // indirect | ||
| github.com/go-openapi/swag/conv v0.26.0 // indirect | ||
| github.com/go-openapi/swag/fileutils v0.26.0 // indirect | ||
| github.com/go-openapi/swag/jsonname v0.26.0 // indirect | ||
| github.com/go-openapi/swag/jsonutils v0.26.0 // indirect | ||
| github.com/go-openapi/swag/loading v0.26.0 // indirect | ||
| github.com/go-openapi/swag/mangling v0.26.0 // indirect | ||
| github.com/go-openapi/swag/netutils v0.26.0 // indirect | ||
| github.com/go-openapi/swag/stringutils v0.26.0 // indirect | ||
| github.com/go-openapi/swag/typeutils v0.26.0 // indirect | ||
| github.com/go-openapi/swag/yamlutils v0.26.0 // indirect | ||
| github.com/gobuffalo/flect v1.0.3 // indirect | ||
| github.com/google/cel-go v0.27.0 // indirect | ||
| github.com/google/gnostic-models v0.7.1 // indirect | ||
| github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 // indirect | ||
| github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 // indirect | ||
| github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.3 // indirect | ||
| github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect | ||
| github.com/kylelemons/godebug v1.1.0 // indirect | ||
| github.com/mattn/go-colorable v0.1.15 // indirect | ||
| github.com/mattn/go-isatty v0.0.22 // indirect | ||
| github.com/onsi/ginkgo/v2 v2.28.2 // indirect | ||
| github.com/rogpeppe/go-internal v1.15.0 // indirect | ||
| github.com/shopspring/decimal v1.3.1 // indirect | ||
| github.com/spf13/cast v1.10.0 // indirect | ||
| github.com/stretchr/objx v0.5.3 // indirect | ||
| github.com/x448/float16 v0.8.4 // indirect | ||
| go.opentelemetry.io/auto/sdk v1.2.1 // indirect | ||
| go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.41.0 // indirect | ||
| go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.41.0 // indirect | ||
| go.yaml.in/yaml/v2 v2.4.4 // indirect | ||
| go.yaml.in/yaml/v3 v3.0.4 // indirect | ||
| golang.org/x/exp v0.0.0-20260529124908-c761662dc8c9 // indirect | ||
| google.golang.org/genproto/googleapis/api v0.0.0-20260226221140-a57be14db171 // indirect | ||
| google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 // indirect | ||
| gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect | ||
| k8s.io/apiserver v0.36.2 // indirect | ||
| k8s.io/gengo/v2 v2.0.0-20260408192533-25e2208e0dc3 // indirect | ||
| k8s.io/kms v0.36.2 // indirect | ||
| k8s.io/kube-aggregator v0.36.2 // indirect | ||
| k8s.io/streaming v0.36.2 // indirect | ||
| sigs.k8s.io/randfill v1.0.0 // indirect | ||
| sigs.k8s.io/structured-merge-diff/v6 v6.4.0 // indirect | ||
| ) | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove the comment; that's an explanation of this PR, not an explanation of that code/config. We don't want future readers to think that this is supposed to always be kept on 1.26/5.0.
Likewise the comments in
Dockerfile.