Skip to content

[release-4.12] 🐛 OCPBUGS-102101: replace golang.org/x/net with openshift-sustaining/net v0.35.0-sec.4 for CVE-2026-33814 #631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
amitesh1201 wants to merge 2 commits into
base: release-4.12
Choose a base branch
from
+22,277 −9,031
Open

[release-4.12] 🐛 OCPBUGS-102101: replace golang.org/x/net with openshift-sustaining/net v0.35.0-sec.4 for CVE-2026-33814 #631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6acda51
UPSTREAM: <carry>: replace golang.org/x/net with openshift-sustaining…
amitesh1201 Sep 2, 2026
958b006
UPSTREAM: <drop>: vendor
amitesh1201 Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
14 changes: 8 additions & 6 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ go 1.17

replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.1.5

replace golang.org/x/net => github.com/openshift-sustaining/net v0.35.0-sec.4

require (
github.com/alessio/shellescape v1.4.1
github.com/apparentlymart/go-cidr v1.1.0
Expand All @@ -16,7 +18,7 @@ require (
github.com/go-logr/logr v1.2.3
github.com/gofrs/flock v0.8.1
github.com/golang/mock v1.6.0
github.com/google/go-cmp v0.5.8
github.com/google/go-cmp v0.6.0
github.com/google/goexpect v0.0.0-20210430020637-ab937bf7fd6f
github.com/google/gofuzz v1.2.0
github.com/onsi/ginkgo v1.16.5
Expand All @@ -26,8 +28,8 @@ require (
github.com/sergi/go-diff v1.2.0
github.com/spf13/cobra v1.5.0
github.com/spf13/pflag v1.0.5
golang.org/x/crypto v0.14.0
golang.org/x/text v0.13.0
golang.org/x/crypto v0.33.0
golang.org/x/text v0.22.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.23.5
k8s.io/apiextensions-apiserver v0.23.5
Expand Down Expand Up @@ -132,10 +134,10 @@ require (
github.com/subosito/gotenv v1.2.0 // indirect
github.com/valyala/fastjson v1.6.3 // indirect
github.com/vincent-petithory/dataurl v1.0.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/net v0.25.0 // indirect
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/sys v0.30.0 // indirect
golang.org/x/term v0.29.0 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
Expand Down
113 changes: 25 additions & 88 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

19 changes: 11 additions & 8 deletions hack/tools/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ module sigs.k8s.io/cluster-api-provider-aws/hack/tools

go 1.17

replace golang.org/x/net => github.com/openshift-sustaining/net v0.35.0-sec.4

require (
github.com/a8m/envsubst v1.3.0
github.com/ahmetb/gen-crd-api-reference-docs v0.3.0
Expand Down Expand Up @@ -101,7 +103,7 @@ require (
github.com/golangci/misspell v0.3.5 // indirect
github.com/golangci/revgrep v0.0.0-20210930125155-c22e5001d4f2 // indirect
github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect
github.com/google/go-cmp v0.5.8 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8 // indirect
Expand Down Expand Up @@ -213,15 +215,16 @@ require (
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.19.1 // indirect
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
golang.org/x/crypto v0.33.0 // indirect
golang.org/x/exp v0.0.0-20211029160041-3396431c207b // indirect
golang.org/x/exp/typeparams v0.0.0-20220613132600-b0d781184e0d // indirect
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 // indirect
golang.org/x/sync v0.0.0-20220513210516-0976fa681c29 // indirect
golang.org/x/sys v0.0.0-20220702020025-31831981b65f // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/tools v0.1.12-0.20220628192153-7743d1d949f1 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/net v0.25.0 // indirect
golang.org/x/sync v0.11.0 // indirect
golang.org/x/sys v0.30.0 // indirect
golang.org/x/text v0.22.0 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
golang.org/x/tools/go/vcs v0.1.0-deprecated // indirect
google.golang.org/protobuf v1.28.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.66.6 // indirect
Expand Down
115 changes: 35 additions & 80 deletions hack/tools/go.sum
View file
Open in desktop

Large diffs are not rendered by default.

80 changes: 42 additions & 38 deletions vendor/github.com/google/go-cmp/cmp/compare.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions ...ub.com/google/go-cmp/cmp/export_unsafe.go → ...or/github.com/google/go-cmp/cmp/export.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 0 additions & 16 deletions vendor/github.com/google/go-cmp/cmp/export_panic.go
View file
Open in desktop

This file was deleted.

44 changes: 24 additions & 20 deletions vendor/github.com/google/go-cmp/cmp/internal/diff/diff.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions ...-cmp/cmp/internal/value/pointer_unsafe.go → ...ogle/go-cmp/cmp/internal/value/pointer.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 0 additions & 34 deletions vendor/github.com/google/go-cmp/cmp/internal/value/pointer_purego.go
View file
Open in desktop

This file was deleted.

Loading