Skip to content

Commit 10a6587

Browse files
authored
Merge pull request #1100 from andyzhangx/GHSA-m425-mq94-257g-1.22
[release-1.22] fix: GHSA-m425-mq94-257g
2 parents ac3fb6a + ae8e1d3 commit 10a6587

File tree

534 files changed

+10556
-4360
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

534 files changed

+10556
-4360
lines changed

go.mod

Lines changed: 52 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@ require (
1313
github.com/golang/mock v1.6.0
1414
github.com/golang/protobuf v1.5.3
1515
github.com/imdario/mergo v0.3.9 // indirect
16-
github.com/kubernetes-csi/csi-lib-utils v0.13.0
16+
github.com/kubernetes-csi/csi-lib-utils v0.11.0
1717
github.com/onsi/gomega v1.27.8
1818
github.com/pborman/uuid v1.2.0
1919
github.com/pelletier/go-toml v1.9.4
2020
github.com/stretchr/testify v1.8.4
2121
golang.org/x/net v0.17.0
22-
google.golang.org/grpc v1.51.0
23-
google.golang.org/protobuf v1.30.0
24-
k8s.io/api v0.27.3
25-
k8s.io/apimachinery v0.27.3
26-
k8s.io/client-go v0.27.3
27-
k8s.io/component-base v0.27.3
22+
google.golang.org/grpc v1.59.0
23+
google.golang.org/protobuf v1.31.0
24+
k8s.io/api v0.27.5
25+
k8s.io/apimachinery v0.27.5
26+
k8s.io/client-go v0.27.5
27+
k8s.io/component-base v0.27.5
2828
k8s.io/klog/v2 v2.100.1
29-
k8s.io/kubernetes v1.27.3
30-
k8s.io/mount-utils v0.27.3
29+
k8s.io/kubernetes v1.27.5
30+
k8s.io/mount-utils v0.27.5
3131
k8s.io/utils v0.0.0-20230209194617-a36077c30491
3232
sigs.k8s.io/cloud-provider-azure v1.27.1-0.20230630150243-d45a7951c84a
3333
sigs.k8s.io/yaml v1.3.0
@@ -42,8 +42,8 @@ require (
4242
github.com/onsi/ginkgo/v2 v2.11.0
4343
github.com/pkg/errors v0.9.1
4444
github.com/satori/go.uuid v1.2.0
45-
k8s.io/apiserver v0.27.3
46-
k8s.io/pod-security-admission v0.27.3
45+
k8s.io/apiserver v0.27.5
46+
k8s.io/pod-security-admission v0.27.5
4747
)
4848

4949
require (
@@ -61,7 +61,7 @@ require (
6161
github.com/beorn7/perks v1.0.1 // indirect
6262
github.com/blang/semver/v4 v4.0.0 // indirect
6363
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
64-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
64+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
6565
github.com/coreos/go-semver v0.3.0 // indirect
6666
github.com/coreos/go-systemd/v22 v22.4.0 // indirect
6767
github.com/davecgh/go-spew v1.1.1 // indirect
@@ -84,7 +84,7 @@ require (
8484
github.com/google/go-cmp v0.5.9 // indirect
8585
github.com/google/gofuzz v1.1.0 // indirect
8686
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
87-
github.com/google/uuid v1.3.0 // indirect
87+
github.com/google/uuid v1.3.1 // indirect
8888
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
8989
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
9090
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -127,60 +127,62 @@ require (
127127
go.uber.org/multierr v1.6.0 // indirect
128128
go.uber.org/zap v1.19.0 // indirect
129129
golang.org/x/crypto v0.14.0 // indirect
130-
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
130+
golang.org/x/oauth2 v0.11.0 // indirect
131131
golang.org/x/sync v0.3.0 // indirect
132-
golang.org/x/sys v0.13.0 // indirect
132+
golang.org/x/sys v0.14.0 // indirect
133133
golang.org/x/term v0.13.0 // indirect
134-
golang.org/x/text v0.13.0 // indirect
134+
golang.org/x/text v0.14.0 // indirect
135135
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
136136
golang.org/x/tools v0.9.3 // indirect
137137
google.golang.org/appengine v1.6.7 // indirect
138-
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
138+
google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 // indirect
139+
google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
140+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
139141
gopkg.in/inf.v0 v0.9.1 // indirect
140142
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
141143
gopkg.in/yaml.v2 v2.4.0 // indirect
142144
gopkg.in/yaml.v3 v3.0.1 // indirect
143145
k8s.io/apiextensions-apiserver v0.0.0 // indirect
144-
k8s.io/cloud-provider v0.27.3 // indirect
145-
k8s.io/component-helpers v0.27.3 // indirect
146-
k8s.io/controller-manager v0.27.3 // indirect
147-
k8s.io/kms v0.27.3 // indirect
146+
k8s.io/cloud-provider v0.27.5 // indirect
147+
k8s.io/component-helpers v0.27.5 // indirect
148+
k8s.io/controller-manager v0.27.5 // indirect
149+
k8s.io/kms v0.27.5 // indirect
148150
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
149151
k8s.io/kubectl v0.0.0 // indirect
150-
k8s.io/kubelet v0.27.3 // indirect
152+
k8s.io/kubelet v0.27.5 // indirect
151153
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
152154
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
153155
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
154156
)
155157

156158
replace (
157-
github.com/niemeyer/pretty => github.com/niemeyer/pretty v0.0.0-20200227.34842-a10e7caefd8e
159+
github.com/niemeyer/pretty => github.com/niemeyer/pretty v0.0.0-20200227.54842-a10e7caefd8e
158160
go.etcd.io/etcd => go.etcd.io/etcd v0.0.0-20200410171415-59f5fb25a533
159-
k8s.io/api => k8s.io/api v0.27.3
160-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.3
161-
k8s.io/apimachinery => k8s.io/apimachinery v0.27.3
162-
k8s.io/apiserver => k8s.io/apiserver v0.27.3
163-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.3
164-
k8s.io/client-go => k8s.io/client-go v0.27.3
165-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.3
166-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.3
167-
k8s.io/code-generator => k8s.io/code-generator v0.27.3
168-
k8s.io/component-base => k8s.io/component-base v0.27.3
169-
k8s.io/component-helpers => k8s.io/component-helpers v0.27.3
170-
k8s.io/controller-manager => k8s.io/controller-manager v0.27.3
171-
k8s.io/cri-api => k8s.io/cri-api v0.27.3
172-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.3
173-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.3
174-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.3
175-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.3
176-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.3
177-
k8s.io/kubectl => k8s.io/kubectl v0.27.3
178-
k8s.io/kubelet => k8s.io/kubelet v0.27.3
179-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.3
180-
k8s.io/metrics => k8s.io/metrics v0.27.3
181-
k8s.io/mount-utils => k8s.io/mount-utils v0.27.3
182-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.3
183-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.3
184-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.27.3
185-
k8s.io/sample-controller => k8s.io/sample-controller v0.27.3
161+
k8s.io/api => k8s.io/api v0.27.5
162+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.5
163+
k8s.io/apimachinery => k8s.io/apimachinery v0.27.5
164+
k8s.io/apiserver => k8s.io/apiserver v0.27.5
165+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.5
166+
k8s.io/client-go => k8s.io/client-go v0.27.5
167+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.5
168+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.5
169+
k8s.io/code-generator => k8s.io/code-generator v0.27.5
170+
k8s.io/component-base => k8s.io/component-base v0.27.5
171+
k8s.io/component-helpers => k8s.io/component-helpers v0.27.5
172+
k8s.io/controller-manager => k8s.io/controller-manager v0.27.5
173+
k8s.io/cri-api => k8s.io/cri-api v0.27.5
174+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.5
175+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.5
176+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.5
177+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.5
178+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.5
179+
k8s.io/kubectl => k8s.io/kubectl v0.27.5
180+
k8s.io/kubelet => k8s.io/kubelet v0.27.5
181+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.5
182+
k8s.io/metrics => k8s.io/metrics v0.27.5
183+
k8s.io/mount-utils => k8s.io/mount-utils v0.27.5
184+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.5
185+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.5
186+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.27.5
187+
k8s.io/sample-controller => k8s.io/sample-controller v0.27.5
186188
)

0 commit comments

Comments
 (0)