Skip to content

Commit b64846f

Browse files
authored
Merge pull request #1101 from andyzhangx/GHSA-m425-mq94-257g-1.21
[release-1.21] fix: GHSA-m425-mq94-257g
2 parents 99bb69d + 53c7d35 commit b64846f

File tree

538 files changed

+9142
-4654
lines changed

Some content is hidden

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

538 files changed

+9142
-4654
lines changed

go.mod

Lines changed: 48 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ require (
1919
github.com/pelletier/go-toml v1.9.4
2020
github.com/stretchr/testify v1.8.2
2121
golang.org/x/net v0.17.0
22-
google.golang.org/grpc v1.49.0
23-
google.golang.org/protobuf v1.28.1
24-
k8s.io/api v0.26.6
25-
k8s.io/apimachinery v0.26.6
26-
k8s.io/client-go v0.26.6
27-
k8s.io/component-base v0.26.6
22+
google.golang.org/grpc v1.59.0
23+
google.golang.org/protobuf v1.31.0
24+
k8s.io/api v0.26.10
25+
k8s.io/apimachinery v0.26.10
26+
k8s.io/client-go v0.26.10
27+
k8s.io/component-base v0.26.10
2828
k8s.io/klog/v2 v2.80.1
29-
k8s.io/kubernetes v1.26.6
30-
k8s.io/mount-utils v0.26.6
29+
k8s.io/kubernetes v1.26.10
30+
k8s.io/mount-utils v0.26.10
3131
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
3232
sigs.k8s.io/cloud-provider-azure v1.26.1-0.20230118112841-6e3f8e03247e
3333
sigs.k8s.io/yaml v1.3.0
@@ -42,8 +42,8 @@ require (
4242
github.com/onsi/ginkgo/v2 v2.9.2
4343
github.com/pkg/errors v0.9.1
4444
github.com/satori/go.uuid v1.2.0
45-
k8s.io/apiserver v0.26.6
46-
k8s.io/pod-security-admission v0.26.6
45+
k8s.io/apiserver v0.26.10
46+
k8s.io/pod-security-admission v0.26.10
4747
)
4848

4949
require (
@@ -59,7 +59,7 @@ require (
5959
github.com/beorn7/perks v1.0.1 // indirect
6060
github.com/blang/semver/v4 v4.0.0 // indirect
6161
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
62-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
62+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
6363
github.com/davecgh/go-spew v1.1.1 // indirect
6464
github.com/docker/distribution v2.8.1+incompatible // indirect
6565
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
@@ -78,7 +78,7 @@ require (
7878
github.com/google/go-cmp v0.5.9 // indirect
7979
github.com/google/gofuzz v1.1.0 // indirect
8080
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
81-
github.com/google/uuid v1.3.0 // indirect
81+
github.com/google/uuid v1.3.1 // indirect
8282
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
8383
github.com/inconshreveable/mousetrap v1.0.1 // indirect
8484
github.com/jmespath/go-jmespath v0.4.0 // indirect
@@ -102,7 +102,7 @@ require (
102102
github.com/prometheus/procfs v0.8.0 // indirect
103103
github.com/spf13/cobra v1.6.1 // indirect
104104
github.com/spf13/pflag v1.0.5 // indirect
105-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.0 // indirect
105+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 // indirect
106106
go.opentelemetry.io/otel v1.10.0 // indirect
107107
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
108108
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
@@ -112,23 +112,25 @@ require (
112112
go.opentelemetry.io/otel/trace v1.10.0 // indirect
113113
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
114114
golang.org/x/crypto v0.14.0 // indirect
115-
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
116-
golang.org/x/sys v0.13.0 // indirect
115+
golang.org/x/oauth2 v0.11.0 // indirect
116+
golang.org/x/sys v0.14.0 // indirect
117117
golang.org/x/term v0.13.0 // indirect
118-
golang.org/x/text v0.13.0 // indirect
118+
golang.org/x/text v0.14.0 // indirect
119119
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
120120
golang.org/x/tools v0.7.0 // indirect
121121
google.golang.org/appengine v1.6.7 // indirect
122-
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
122+
google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 // indirect
123+
google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
124+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
123125
gopkg.in/inf.v0 v0.9.1 // indirect
124126
gopkg.in/yaml.v2 v2.4.0 // indirect
125127
gopkg.in/yaml.v3 v3.0.1 // indirect
126128
k8s.io/apiextensions-apiserver v0.0.0 // indirect
127-
k8s.io/cloud-provider v0.26.6 // indirect
128-
k8s.io/component-helpers v0.26.6 // indirect
129+
k8s.io/cloud-provider v0.26.10 // indirect
130+
k8s.io/component-helpers v0.26.10 // indirect
129131
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
130132
k8s.io/kubectl v0.0.0 // indirect
131-
k8s.io/kubelet v0.26.6 // indirect
133+
k8s.io/kubelet v0.26.10 // indirect
132134
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.37 // indirect
133135
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
134136
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
@@ -137,31 +139,31 @@ require (
137139
replace (
138140
github.com/niemeyer/pretty => github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e
139141
go.etcd.io/etcd => go.etcd.io/etcd v0.0.0-20200410171415-59f5fb25a533
140-
k8s.io/api => k8s.io/api v0.26.6
141-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.6
142-
k8s.io/apimachinery => k8s.io/apimachinery v0.26.6
143-
k8s.io/apiserver => k8s.io/apiserver v0.26.6
144-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.6
145-
k8s.io/client-go => k8s.io/client-go v0.26.6
146-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.6
147-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.6
142+
k8s.io/api => k8s.io/api v0.26.10
143+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.10
144+
k8s.io/apimachinery => k8s.io/apimachinery v0.26.10
145+
k8s.io/apiserver => k8s.io/apiserver v0.26.10
146+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.10
147+
k8s.io/client-go => k8s.io/client-go v0.26.10
148+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.10
149+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.10
148150
k8s.io/code-generator => k8s.io/code-generator v0.20.0
149-
k8s.io/component-base => k8s.io/component-base v0.26.6
150-
k8s.io/component-helpers => k8s.io/component-helpers v0.26.6
151-
k8s.io/controller-manager => k8s.io/controller-manager v0.26.6
152-
k8s.io/cri-api => k8s.io/cri-api v0.26.6
153-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.6
154-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.6
155-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.6
156-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.6
157-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.6
158-
k8s.io/kubectl => k8s.io/kubectl v0.26.6
159-
k8s.io/kubelet => k8s.io/kubelet v0.26.6
160-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.6
161-
k8s.io/metrics => k8s.io/metrics v0.26.6
162-
k8s.io/mount-utils => k8s.io/mount-utils v0.26.6
163-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.6
164-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.6
165-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.6
166-
k8s.io/sample-controller => k8s.io/sample-controller v0.26.6
151+
k8s.io/component-base => k8s.io/component-base v0.26.10
152+
k8s.io/component-helpers => k8s.io/component-helpers v0.26.10
153+
k8s.io/controller-manager => k8s.io/controller-manager v0.26.10
154+
k8s.io/cri-api => k8s.io/cri-api v0.26.10
155+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.10
156+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.10
157+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.10
158+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.10
159+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.10
160+
k8s.io/kubectl => k8s.io/kubectl v0.26.10
161+
k8s.io/kubelet => k8s.io/kubelet v0.26.10
162+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.10
163+
k8s.io/metrics => k8s.io/metrics v0.26.10
164+
k8s.io/mount-utils => k8s.io/mount-utils v0.26.10
165+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.10
166+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.10
167+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.10
168+
k8s.io/sample-controller => k8s.io/sample-controller v0.26.10
167169
)

0 commit comments

Comments
 (0)