Skip to content

Commit

Permalink
Merge pull request #2047 from andyzhangx/CVE-2023-3676-1.26
Browse files Browse the repository at this point in the history
[release-1.26] fix: CVE-2023-3676, GHSA-m425-mq94-257g
  • Loading branch information
andyzhangx committed Nov 7, 2023
2 parents e040003 + 7eb14f9 commit e9df75b
Show file tree
Hide file tree
Showing 523 changed files with 9,096 additions and 4,600 deletions.
92 changes: 47 additions & 45 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
github.com/container-storage-interface/spec v1.7.0
github.com/golang/mock v1.6.0
github.com/golang/protobuf v1.5.2
github.com/golang/protobuf v1.5.3
github.com/google/gofuzz v1.2.0 // indirect
github.com/imdario/mergo v0.3.11 // indirect
github.com/kubernetes-csi/csi-lib-utils v0.10.0
Expand All @@ -21,15 +21,15 @@ require (
github.com/pelletier/go-toml v1.9.4
github.com/stretchr/testify v1.8.2
golang.org/x/net v0.17.0
google.golang.org/grpc v1.49.0
google.golang.org/protobuf v1.28.1
k8s.io/api v0.26.6
k8s.io/apimachinery v0.26.6
k8s.io/client-go v0.26.6
k8s.io/cloud-provider v0.26.6
k8s.io/component-base v0.26.6
google.golang.org/grpc v1.59.0
google.golang.org/protobuf v1.31.0
k8s.io/api v0.26.10
k8s.io/apimachinery v0.26.10
k8s.io/client-go v0.26.10
k8s.io/cloud-provider v0.26.10
k8s.io/component-base v0.26.10
k8s.io/klog/v2 v2.90.1
k8s.io/kubernetes v1.26.6
k8s.io/kubernetes v1.26.10
k8s.io/mount-utils v0.0.0
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
sigs.k8s.io/cloud-provider-azure v1.26.1-0.20230307123634-631b3a4199f1
Expand All @@ -41,7 +41,7 @@ require (
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.2.0
github.com/jongio/azidext/go/azidext v0.4.0
github.com/onsi/ginkgo/v2 v2.8.1
k8s.io/pod-security-admission v0.26.6
k8s.io/pod-security-admission v0.26.10
)

require (
Expand All @@ -57,7 +57,7 @@ require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/distribution v2.8.1+incompatible // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
Expand All @@ -73,7 +73,7 @@ require (
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/google/uuid v1.3.1 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
Expand All @@ -98,7 +98,7 @@ require (
github.com/prometheus/procfs v0.8.0 // indirect
github.com/spf13/cobra v1.6.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 // indirect
go.opentelemetry.io/otel v1.10.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
Expand All @@ -108,19 +108,21 @@ require (
go.opentelemetry.io/otel/trace v1.10.0 // indirect
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/oauth2 v0.11.0 // indirect
golang.org/x/sys v0.14.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20231012201019-e917dd12ba7a // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.0.0 // indirect
k8s.io/apiserver v0.26.6 // indirect
k8s.io/component-helpers v0.26.6 // indirect
k8s.io/apiserver v0.26.10 // indirect
k8s.io/component-helpers v0.26.10 // indirect
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
k8s.io/kubectl v0.0.0 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.37 // indirect
Expand All @@ -133,31 +135,31 @@ replace (
github.com/onsi/ginkgo/v2 => github.com/onsi/ginkgo/v2 v2.4.0
go.etcd.io/etcd => go.etcd.io/etcd v0.0.0-20200410171415-59f5fb25a533
golang.org/x/text => golang.org/x/text v0.3.8
k8s.io/api => k8s.io/api v0.26.6
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.6
k8s.io/apimachinery => k8s.io/apimachinery v0.26.6
k8s.io/apiserver => k8s.io/apiserver v0.26.6
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.6
k8s.io/client-go => k8s.io/client-go v0.26.6
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.6
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.6
k8s.io/code-generator => k8s.io/code-generator v0.26.6
k8s.io/component-base => k8s.io/component-base v0.26.6
k8s.io/component-helpers => k8s.io/component-helpers v0.26.6
k8s.io/controller-manager => k8s.io/controller-manager v0.26.6
k8s.io/cri-api => k8s.io/cri-api v0.26.6
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.6
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.6
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.6
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.6
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.6
k8s.io/kubectl => k8s.io/kubectl v0.26.6
k8s.io/kubelet => k8s.io/kubelet v0.26.6
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.6
k8s.io/metrics => k8s.io/metrics v0.26.6
k8s.io/api => k8s.io/api v0.26.10
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.10
k8s.io/apimachinery => k8s.io/apimachinery v0.26.10
k8s.io/apiserver => k8s.io/apiserver v0.26.10
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.10
k8s.io/client-go => k8s.io/client-go v0.26.10
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.10
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.10
k8s.io/code-generator => k8s.io/code-generator v0.26.10
k8s.io/component-base => k8s.io/component-base v0.26.10
k8s.io/component-helpers => k8s.io/component-helpers v0.26.10
k8s.io/controller-manager => k8s.io/controller-manager v0.26.10
k8s.io/cri-api => k8s.io/cri-api v0.26.10
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.10
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.10
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.10
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.10
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.10
k8s.io/kubectl => k8s.io/kubectl v0.26.10
k8s.io/kubelet => k8s.io/kubelet v0.26.10
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.10
k8s.io/metrics => k8s.io/metrics v0.26.10
k8s.io/mount-utils => k8s.io/mount-utils v0.0.0-20221216112627-49433b159e95
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.6
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.6
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.6
k8s.io/sample-controller => k8s.io/sample-controller v0.26.6
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.10
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.10
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.10
k8s.io/sample-controller => k8s.io/sample-controller v0.26.10
)
Loading

0 comments on commit e9df75b

Please sign in to comment.