Skip to content

Commit

Permalink
Merge pull request #13 from kyrtapz/cve_4.12
Browse files Browse the repository at this point in the history 
[release-4.12] Address CVE
  • Loading branch information
@jupierce
jupierce committed Apr 4, 2024
2 parents 9946c63 + e83aac3 commit bd92d70
Show file tree
Hide file tree
Showing 58 changed files with 387 additions and 901 deletions.
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ require (
go.opentelemetry.io/proto/otlp v0.7.0
go.uber.org/zap v1.19.0
golang.org/x/crypto v0.14.0
golang.org/x/net v0.17.0
golang.org/x/net v0.10.0
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5
golang.org/x/sync v0.1.0
golang.org/x/sys v0.13.0
Expand Down Expand Up @@ -581,7 +581,7 @@ replace (
golang.org/x/lint => golang.org/x/lint v0.0.0-20190930215403-16217165b5de
golang.org/x/mobile => golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f
golang.org/x/mod => golang.org/x/mod v0.8.0
golang.org/x/net => golang.org/x/net v0.17.0
golang.org/x/net => github.com/openshift-priv/golang-net v0.0.0-20240328080036-60d0f00ca866
golang.org/x/oauth2 => golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
golang.org/x/sync => golang.org/x/sync v0.1.0
golang.org/x/sys => golang.org/x/sys v0.13.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,8 @@ github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 h1:3
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
github.com/opencontainers/selinux v1.10.0 h1:rAiKF8hTcgLI3w0DHm6i0ylVVcOrlgR1kK99DRLDhyU=
github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI=
github.com/openshift-priv/golang-net v0.0.0-20240328080036-60d0f00ca866 h1:mA2EN6Mbo0ifsvV57tEa9Yxo10s1TxkJGbJOWZkGMic=
github.com/openshift-priv/golang-net v0.0.0-20240328080036-60d0f00ca866/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
github.com/openshift/api v0.0.0-20221116152553-4b67c2b2bb1e h1:1MXi1NzWM2HVQrjL7rMz/43Py5WqfDCsl5tu7RU37XI=
github.com/openshift/api v0.0.0-20221116152553-4b67c2b2bb1e/go.mod h1:aQ6LDasvHMvHZXqLHnX2GRmnfTWCF/iIwz8EMTTIE9A=
github.com/openshift/apiserver-library-go v0.0.0-20230628111429-48f403f18d04 h1:tDpDeF3GezbnjZVXgDq6vC8Y0xs4UnDe3fPZw4q8/WM=
Expand Down Expand Up @@ -496,8 +498,6 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl
golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4=
golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 h1:RerP+noqYHUQ8CMRcPlC2nvTa4dcBIjegkuWdcUDuqg=
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
Expand Down
3 changes: 2 additions & 1 deletion staging/src/k8s.io/api/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/text v0.13.0 // indirect
google.golang.org/protobuf v1.28.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
Expand All @@ -41,6 +41,7 @@ replace (
github.com/matttproud/golang_protobuf_extensions => github.com/matttproud/golang_protobuf_extensions v1.0.1
github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.0.0-20221005160638-5fa9cd70cd8c
golang.org/x/lint => golang.org/x/lint v0.0.0-20190930215403-16217165b5de
golang.org/x/net => github.com/openshift-priv/golang-net v0.0.0-20240328080036-60d0f00ca866
golang.org/x/oauth2 => golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
k8s.io/api => ../api
k8s.io/apiextensions-apiserver => ../apiextensions-apiserver
Expand Down
22 changes: 12 additions & 10 deletions staging/src/k8s.io/api/go.sum
View file

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

3 changes: 2 additions & 1 deletion staging/src/k8s.io/apiextensions-apiserver/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ require (
go.uber.org/zap v1.19.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/mod v0.8.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.13.0 // indirect
Expand All @@ -132,6 +132,7 @@ replace (
github.com/matttproud/golang_protobuf_extensions => github.com/matttproud/golang_protobuf_extensions v1.0.1
github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.0.0-20221005160638-5fa9cd70cd8c
golang.org/x/lint => golang.org/x/lint v0.0.0-20190930215403-16217165b5de
golang.org/x/net => github.com/openshift-priv/golang-net v0.0.0-20240328080036-60d0f00ca866
golang.org/x/oauth2 => golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
k8s.io/api => ../api
k8s.io/apiextensions-apiserver => ../apiextensions-apiserver
Expand Down

0 comments on commit bd92d70

Please sign in to comment.