Skip to content

Commit f61ffb9

Browse files
authored
Merge pull request #1117 from andyzhangx/CVE-2023-5528-1.22
[release-1.22] fix: CVE-2023-5528
2 parents d88075d + f42e807 commit f61ffb9

File tree

49 files changed

+2350
-355
lines changed

Some content is hidden

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

49 files changed

+2350
-355
lines changed

go.mod

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ require (
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.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
24+
k8s.io/api v0.27.8
25+
k8s.io/apimachinery v0.27.8
26+
k8s.io/client-go v0.27.8
27+
k8s.io/component-base v0.27.8
2828
k8s.io/klog/v2 v2.100.1
29-
k8s.io/kubernetes v1.27.5
30-
k8s.io/mount-utils v0.27.5
29+
k8s.io/kubernetes v1.27.8
30+
k8s.io/mount-utils v0.27.8
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.5
46-
k8s.io/pod-security-admission v0.27.5
45+
k8s.io/apiserver v0.27.8
46+
k8s.io/pod-security-admission v0.27.8
4747
)
4848

4949
require (
@@ -79,14 +79,14 @@ require (
7979
github.com/gogo/protobuf v1.3.2 // indirect
8080
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
8181
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
82-
github.com/google/cel-go v0.12.6 // indirect
82+
github.com/google/cel-go v0.12.7 // indirect
8383
github.com/google/gnostic v0.5.7-v3refs // indirect
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
8787
github.com/google/uuid v1.3.1 // indirect
8888
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
89-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
89+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
9090
github.com/inconshreveable/mousetrap v1.1.0 // indirect
9191
github.com/josharian/intern v1.0.0 // indirect
9292
github.com/json-iterator/go v1.1.12 // indirect
@@ -132,8 +132,8 @@ require (
132132
golang.org/x/sys v0.14.0 // indirect
133133
golang.org/x/term v0.13.0 // indirect
134134
golang.org/x/text v0.14.0 // indirect
135-
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
136-
golang.org/x/tools v0.9.3 // indirect
135+
golang.org/x/time v0.3.0 // indirect
136+
golang.org/x/tools v0.12.0 // indirect
137137
google.golang.org/appengine v1.6.7 // indirect
138138
google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 // indirect
139139
google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
@@ -143,46 +143,46 @@ require (
143143
gopkg.in/yaml.v2 v2.4.0 // indirect
144144
gopkg.in/yaml.v3 v3.0.1 // indirect
145145
k8s.io/apiextensions-apiserver v0.0.0 // 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
146+
k8s.io/cloud-provider v0.27.8 // indirect
147+
k8s.io/component-helpers v0.27.8 // indirect
148+
k8s.io/controller-manager v0.27.8 // indirect
149+
k8s.io/kms v0.27.8 // indirect
150150
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
151151
k8s.io/kubectl v0.0.0 // indirect
152-
k8s.io/kubelet v0.27.5 // indirect
152+
k8s.io/kubelet v0.27.8 // indirect
153153
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
154154
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
155155
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
156156
)
157157

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

0 commit comments

Comments
 (0)