Skip to content

Commit b314362

Browse files
authored
Merge pull request #1118 from andyzhangx/CVE-2023-5528-1.21
[release-1.21] fix: CVE-2023-5528
2 parents d35e130 + a159bdf commit b314362

File tree

37 files changed

+4143
-949
lines changed

37 files changed

+4143
-949
lines changed

go.mod

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ require (
1717
github.com/onsi/gomega v1.27.4
1818
github.com/pborman/uuid v1.2.0
1919
github.com/pelletier/go-toml v1.9.4
20-
github.com/stretchr/testify v1.8.2
20+
github.com/stretchr/testify v1.8.3
2121
golang.org/x/net v0.17.0
2222
google.golang.org/grpc v1.59.0
2323
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
24+
k8s.io/api v0.26.11
25+
k8s.io/apimachinery v0.26.11
26+
k8s.io/client-go v0.26.11
27+
k8s.io/component-base v0.26.11
2828
k8s.io/klog/v2 v2.80.1
29-
k8s.io/kubernetes v1.26.10
30-
k8s.io/mount-utils v0.26.10
29+
k8s.io/kubernetes v1.26.11
30+
k8s.io/mount-utils v0.26.11
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.10
46-
k8s.io/pod-security-admission v0.26.10
45+
k8s.io/apiserver v0.26.11
46+
k8s.io/pod-security-admission v0.26.11
4747
)
4848

4949
require (
@@ -79,7 +79,7 @@ require (
7979
github.com/google/gofuzz v1.1.0 // indirect
8080
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
8181
github.com/google/uuid v1.3.1 // indirect
82-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
82+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
8383
github.com/inconshreveable/mousetrap v1.0.1 // indirect
8484
github.com/jmespath/go-jmespath v0.4.0 // indirect
8585
github.com/josharian/intern v1.0.0 // indirect
@@ -116,8 +116,8 @@ require (
116116
golang.org/x/sys v0.14.0 // indirect
117117
golang.org/x/term v0.13.0 // indirect
118118
golang.org/x/text v0.14.0 // indirect
119-
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
120-
golang.org/x/tools v0.7.0 // indirect
119+
golang.org/x/time v0.3.0 // indirect
120+
golang.org/x/tools v0.12.0 // indirect
121121
google.golang.org/appengine v1.6.7 // indirect
122122
google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 // indirect
123123
google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
@@ -126,11 +126,11 @@ require (
126126
gopkg.in/yaml.v2 v2.4.0 // indirect
127127
gopkg.in/yaml.v3 v3.0.1 // indirect
128128
k8s.io/apiextensions-apiserver v0.0.0 // indirect
129-
k8s.io/cloud-provider v0.26.10 // indirect
130-
k8s.io/component-helpers v0.26.10 // indirect
129+
k8s.io/cloud-provider v0.26.11 // indirect
130+
k8s.io/component-helpers v0.26.11 // indirect
131131
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
132132
k8s.io/kubectl v0.0.0 // indirect
133-
k8s.io/kubelet v0.26.10 // indirect
133+
k8s.io/kubelet v0.26.11 // indirect
134134
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.37 // indirect
135135
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
136136
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
@@ -139,31 +139,31 @@ require (
139139
replace (
140140
github.com/niemeyer/pretty => github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e
141141
go.etcd.io/etcd => go.etcd.io/etcd v0.0.0-20200410171415-59f5fb25a533
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
142+
k8s.io/api => k8s.io/api v0.26.11
143+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.11
144+
k8s.io/apimachinery => k8s.io/apimachinery v0.26.11
145+
k8s.io/apiserver => k8s.io/apiserver v0.26.11
146+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.11
147+
k8s.io/client-go => k8s.io/client-go v0.26.11
148+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.11
149+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.11
150150
k8s.io/code-generator => k8s.io/code-generator v0.20.0
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
151+
k8s.io/component-base => k8s.io/component-base v0.26.11
152+
k8s.io/component-helpers => k8s.io/component-helpers v0.26.11
153+
k8s.io/controller-manager => k8s.io/controller-manager v0.26.11
154+
k8s.io/cri-api => k8s.io/cri-api v0.26.11
155+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.11
156+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.11
157+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.11
158+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.11
159+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.11
160+
k8s.io/kubectl => k8s.io/kubectl v0.26.11
161+
k8s.io/kubelet => k8s.io/kubelet v0.26.11
162+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.11
163+
k8s.io/metrics => k8s.io/metrics v0.26.11
164+
k8s.io/mount-utils => k8s.io/mount-utils v0.26.11
165+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.11
166+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.11
167+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.11
168+
k8s.io/sample-controller => k8s.io/sample-controller v0.26.11
169169
)

0 commit comments

Comments
 (0)