Skip to content

Commit cad4f15

Browse files
authored
Merge pull request #1116 from andyzhangx/CVE-2023-5528-1.23
[release-1.23] fix: CVE-2023-5528
2 parents 2e208db + 2b14467 commit cad4f15

File tree

21 files changed

+363
-189
lines changed

21 files changed

+363
-189
lines changed

go.mod

Lines changed: 41 additions & 41 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.28.1
25-
k8s.io/apimachinery v0.28.1
26-
k8s.io/client-go v0.28.1
27-
k8s.io/component-base v0.28.1
24+
k8s.io/api v0.28.4
25+
k8s.io/apimachinery v0.28.4
26+
k8s.io/client-go v0.28.4
27+
k8s.io/component-base v0.28.4
2828
k8s.io/klog/v2 v2.100.1
29-
k8s.io/kubernetes v1.28.1
30-
k8s.io/mount-utils v0.28.1
29+
k8s.io/kubernetes v1.28.4
30+
k8s.io/mount-utils v0.28.4
3131
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
3232
sigs.k8s.io/cloud-provider-azure v1.27.1-0.20230907063607-e9994a5f9c7a
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.28.1
46-
k8s.io/pod-security-admission v0.28.1
45+
k8s.io/apiserver v0.28.4
46+
k8s.io/pod-security-admission v0.28.4
4747
)
4848

4949
require (
@@ -79,7 +79,7 @@ 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.16.0 // indirect
82+
github.com/google/cel-go v0.16.1 // indirect
8383
github.com/google/gnostic-models v0.6.8 // indirect
8484
github.com/google/go-cmp v0.5.9 // indirect
8585
github.com/google/gofuzz v1.2.0 // indirect
@@ -143,13 +143,13 @@ 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.28.1 // indirect
147-
k8s.io/component-helpers v0.28.1 // indirect
148-
k8s.io/controller-manager v0.28.1 // indirect
149-
k8s.io/kms v0.28.1 // indirect
146+
k8s.io/cloud-provider v0.28.4 // indirect
147+
k8s.io/component-helpers v0.28.4 // indirect
148+
k8s.io/controller-manager v0.28.4 // indirect
149+
k8s.io/kms v0.28.4 // indirect
150150
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
151151
k8s.io/kubectl v0.0.0 // indirect
152-
k8s.io/kubelet v0.28.1 // indirect
152+
k8s.io/kubelet v0.28.4 // 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
@@ -158,31 +158,31 @@ require (
158158
replace (
159159
github.com/niemeyer/pretty => github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e
160160
go.etcd.io/etcd => go.etcd.io/etcd v0.0.0-20200410171415-59f5fb25a533
161-
k8s.io/api => k8s.io/api v0.28.1
162-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.1
163-
k8s.io/apimachinery => k8s.io/apimachinery v0.28.1
164-
k8s.io/apiserver => k8s.io/apiserver v0.28.1
165-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.1
166-
k8s.io/client-go => k8s.io/client-go v0.28.1
167-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.1
168-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.1
169-
k8s.io/code-generator => k8s.io/code-generator v0.28.1
170-
k8s.io/component-base => k8s.io/component-base v0.28.1
171-
k8s.io/component-helpers => k8s.io/component-helpers v0.28.1
172-
k8s.io/controller-manager => k8s.io/controller-manager v0.28.1
173-
k8s.io/cri-api => k8s.io/cri-api v0.28.1
174-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.1
175-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.1
176-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.1
177-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.1
178-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.1
179-
k8s.io/kubectl => k8s.io/kubectl v0.28.1
180-
k8s.io/kubelet => k8s.io/kubelet v0.28.1
181-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.1
182-
k8s.io/metrics => k8s.io/metrics v0.28.1
183-
k8s.io/mount-utils => k8s.io/mount-utils v0.28.1
184-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.1
185-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.1
186-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.28.1
187-
k8s.io/sample-controller => k8s.io/sample-controller v0.28.1
161+
k8s.io/api => k8s.io/api v0.28.4
162+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.4
163+
k8s.io/apimachinery => k8s.io/apimachinery v0.28.4
164+
k8s.io/apiserver => k8s.io/apiserver v0.28.4
165+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.4
166+
k8s.io/client-go => k8s.io/client-go v0.28.4
167+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.4
168+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.4
169+
k8s.io/code-generator => k8s.io/code-generator v0.28.4
170+
k8s.io/component-base => k8s.io/component-base v0.28.4
171+
k8s.io/component-helpers => k8s.io/component-helpers v0.28.4
172+
k8s.io/controller-manager => k8s.io/controller-manager v0.28.4
173+
k8s.io/cri-api => k8s.io/cri-api v0.28.4
174+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.4
175+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.4
176+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.4
177+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.4
178+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.4
179+
k8s.io/kubectl => k8s.io/kubectl v0.28.4
180+
k8s.io/kubelet => k8s.io/kubelet v0.28.4
181+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.4
182+
k8s.io/metrics => k8s.io/metrics v0.28.4
183+
k8s.io/mount-utils => k8s.io/mount-utils v0.28.4
184+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.4
185+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.4
186+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.28.4
187+
k8s.io/sample-controller => k8s.io/sample-controller v0.28.4
188188
)

go.sum

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,8 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu
204204
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
205205
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
206206
github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
207-
github.com/google/cel-go v0.16.0 h1:DG9YQ8nFCFXAs/FDDwBxmL1tpKNrdlGUM9U3537bX/Y=
208-
github.com/google/cel-go v0.16.0/go.mod h1:HXZKzB0LXqer5lHHgfWAnlYwJaQBDKMjxjulNQzhwhY=
207+
github.com/google/cel-go v0.16.1 h1:3hZfSNiAU3KOiNtxuFXVp5WFy4hf/Ly3Sa4/7F8SXNo=
208+
github.com/google/cel-go v0.16.1/go.mod h1:HXZKzB0LXqer5lHHgfWAnlYwJaQBDKMjxjulNQzhwhY=
209209
github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
210210
github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U=
211211
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -737,41 +737,41 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
737737
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
738738
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
739739
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
740-
k8s.io/api v0.28.1 h1:i+0O8k2NPBCPYaMB+uCkseEbawEt/eFaiRqUx8aB108=
741-
k8s.io/api v0.28.1/go.mod h1:uBYwID+66wiL28Kn2tBjBYQdEU0Xk0z5qF8bIBqk/Dg=
742-
k8s.io/apiextensions-apiserver v0.28.1 h1:l2ThkBRjrWpw4f24uq0Da2HaEgqJZ7pcgiEUTKSmQZw=
743-
k8s.io/apiextensions-apiserver v0.28.1/go.mod h1:sVvrI+P4vxh2YBBcm8n2ThjNyzU4BQGilCQ/JAY5kGs=
744-
k8s.io/apimachinery v0.28.1 h1:EJD40og3GizBSV3mkIoXQBsws32okPOy+MkRyzh6nPY=
745-
k8s.io/apimachinery v0.28.1/go.mod h1:X0xh/chESs2hP9koe+SdIAcXWcQ+RM5hy0ZynB+yEvw=
746-
k8s.io/apiserver v0.28.1 h1:dw2/NKauDZCnOUAzIo2hFhtBRUo6gQK832NV8kuDbGM=
747-
k8s.io/apiserver v0.28.1/go.mod h1:d8aizlSRB6yRgJ6PKfDkdwCy2DXt/d1FDR6iJN9kY1w=
748-
k8s.io/client-go v0.28.1 h1:pRhMzB8HyLfVwpngWKE8hDcXRqifh1ga2Z/PU9SXVK8=
749-
k8s.io/client-go v0.28.1/go.mod h1:pEZA3FqOsVkCc07pFVzK076R+P/eXqsgx5zuuRWukNE=
750-
k8s.io/cloud-provider v0.28.1 h1:bR7lIRYBHqxfsOkUsY2hJ7V7vmStxb0wjJJdrID8+7I=
751-
k8s.io/cloud-provider v0.28.1/go.mod h1:7jxsc3c15go606KLXnUq8Cy4nX1R1dxFRgn/czIJp/Q=
752-
k8s.io/component-base v0.28.1 h1:LA4AujMlK2mr0tZbQDZkjWbdhTV5bRyEyAFe0TJxlWg=
753-
k8s.io/component-base v0.28.1/go.mod h1:jI11OyhbX21Qtbav7JkhehyBsIRfnO8oEgoAR12ArIU=
754-
k8s.io/component-helpers v0.28.1 h1:ts/vykhyUmPLhUl/hdLdf+a4BWA0giQ3f25HAIhl+RI=
755-
k8s.io/component-helpers v0.28.1/go.mod h1:rHFPj33uXNbgppg+ilmjJ4oR73prZQNRRmg+utVOAb0=
756-
k8s.io/controller-manager v0.28.1 h1:+md/3DAsdLVoMe3AewhyTxljnPLE/gyshTDZ8sX4Rf0=
757-
k8s.io/controller-manager v0.28.1/go.mod h1:yZ8aOBpMYOBTAI/Jd0qpaUzZUlQigmtRcdYg2VgWKiU=
758-
k8s.io/csi-translation-lib v0.28.1 h1:6EdpqKbwgJEcLxRzcGR1GnbyJrcTcUMhHTYfMwFT3LA=
740+
k8s.io/api v0.28.4 h1:8ZBrLjwosLl/NYgv1P7EQLqoO8MGQApnbgH8tu3BMzY=
741+
k8s.io/api v0.28.4/go.mod h1:axWTGrY88s/5YE+JSt4uUi6NMM+gur1en2REMR7IRj0=
742+
k8s.io/apiextensions-apiserver v0.28.4 h1:AZpKY/7wQ8n+ZYDtNHbAJBb+N4AXXJvyZx6ww6yAJvU=
743+
k8s.io/apiextensions-apiserver v0.28.4/go.mod h1:pgQIZ1U8eJSMQcENew/0ShUTlePcSGFq6dxSxf2mwPM=
744+
k8s.io/apimachinery v0.28.4 h1:zOSJe1mc+GxuMnFzD4Z/U1wst50X28ZNsn5bhgIIao8=
745+
k8s.io/apimachinery v0.28.4/go.mod h1:wI37ncBvfAoswfq626yPTe6Bz1c22L7uaJ8dho83mgg=
746+
k8s.io/apiserver v0.28.4 h1:BJXlaQbAU/RXYX2lRz+E1oPe3G3TKlozMMCZWu5GMgg=
747+
k8s.io/apiserver v0.28.4/go.mod h1:Idq71oXugKZoVGUUL2wgBCTHbUR+FYTWa4rq9j4n23w=
748+
k8s.io/client-go v0.28.4 h1:Np5ocjlZcTrkyRJ3+T3PkXDpe4UpatQxj85+xjaD2wY=
749+
k8s.io/client-go v0.28.4/go.mod h1:0VDZFpgoZfelyP5Wqu0/r/TRYcLYuJ2U1KEeoaPa1N4=
750+
k8s.io/cloud-provider v0.28.4 h1:7obmeuJJ5CYTO9HANDqemf/d2v95U+F0t8aeH4jNOsQ=
751+
k8s.io/cloud-provider v0.28.4/go.mod h1:xbhmGZ7wRHgXFP3SNsvdmFRO87KJIvirDYQA5ydMgGA=
752+
k8s.io/component-base v0.28.4 h1:c/iQLWPdUgI90O+T9TeECg8o7N3YJTiuz2sKxILYcYo=
753+
k8s.io/component-base v0.28.4/go.mod h1:m9hR0uvqXDybiGL2nf/3Lf0MerAfQXzkfWhUY58JUbU=
754+
k8s.io/component-helpers v0.28.4 h1:+X9VXT5+jUsRdC26JyMZ8Fjfln7mSjgumafocE509C4=
755+
k8s.io/component-helpers v0.28.4/go.mod h1:8LzMalOQ0K10tkBJWBWq8h0HTI9HDPx4WT3QvTFn9Ro=
756+
k8s.io/controller-manager v0.28.4 h1:8uJmo1pD6fWYk4mC/JfZQU6zPvuCgEHf3pd5G39ldDU=
757+
k8s.io/controller-manager v0.28.4/go.mod h1:pnO+UK2mcWNu1MxucqI8xHPD/8UBm04IUmp2u/3vbnM=
758+
k8s.io/csi-translation-lib v0.28.4 h1:4TrU2zefZGU5HQCyPZvcPxkS6IowqZ/jBs2Qi/dPUpc=
759759
k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
760760
k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
761-
k8s.io/kms v0.28.1 h1:QLNTIc0k7Yebkt9yobj9Y9qBoRCMB4dq+pFCxVXVBnY=
762-
k8s.io/kms v0.28.1/go.mod h1:I2TwA8oerDRInHWWBOqSUzv1EJDC1+55FQKYkxaPxh0=
761+
k8s.io/kms v0.28.4 h1:PMgY/3CQTWP9eIKmNQiTgjLIZ0ns6O+voagzD2/4mSg=
762+
k8s.io/kms v0.28.4/go.mod h1:HL4/lR/bhjAJPbqycKtfhWiKh1Sp21cpHOL8P4oo87w=
763763
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ=
764764
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM=
765-
k8s.io/kubectl v0.28.1 h1:jAq4yKEqQL+fwkWcEsUWxhJ7uIRcOYQraJxx4SyAMTY=
766-
k8s.io/kubectl v0.28.1/go.mod h1:a0nk/lMMeKBulp0lMTJAKbkjZg1ykqfLfz/d6dnv1ak=
767-
k8s.io/kubelet v0.28.1 h1:QRfx+jrzNgkLnMSw/nxGkAN7cjHPO446MDbjPITxLkk=
768-
k8s.io/kubelet v0.28.1/go.mod h1:xYBbbJ0e2Rtb/hv+QFie448lFF81J990ImIptce2AHk=
769-
k8s.io/kubernetes v1.28.1 h1:ZQuukGbpVjSbMypkjNErpbsSHni6RPgoqz+2zDBsuMY=
770-
k8s.io/kubernetes v1.28.1/go.mod h1:rBQpjGYlLBV0KuOLw8EG45N5EBCskWiPpi0xy5liHMI=
771-
k8s.io/mount-utils v0.28.1 h1:oyPtn8ZVxniBfwSlQaBF4fr7QVNYzUuk+gkuxEJgil0=
772-
k8s.io/mount-utils v0.28.1/go.mod h1:AyP8LmZSLgpGdFQr+vzHTerlPiGvXUdP99n98Er47jw=
773-
k8s.io/pod-security-admission v0.28.1 h1:d3jvo/+C6yDR1wnlX9ot1WvLyJ5R4uachJyxhdn9cW8=
774-
k8s.io/pod-security-admission v0.28.1/go.mod h1:Qm1rSy3l96m6QXGNU/8u+cmdpNdmAeA3OYDinrXhi6U=
765+
k8s.io/kubectl v0.28.4 h1:gWpUXW/T7aFne+rchYeHkyB8eVDl5UZce8G4X//kjUQ=
766+
k8s.io/kubectl v0.28.4/go.mod h1:CKOccVx3l+3MmDbkXtIUtibq93nN2hkDR99XDCn7c/c=
767+
k8s.io/kubelet v0.28.4 h1:Ypxy1jaFlSXFXbg/yVtFOU2ZxErBVRJfLu8+t4s7Dtw=
768+
k8s.io/kubelet v0.28.4/go.mod h1:w1wPI12liY/aeC70nqKYcNNkr6/nbyvdMB7P7wmww2o=
769+
k8s.io/kubernetes v1.28.4 h1:aRNxs5jb8FVTtlnxeA4FSDBVKuFwA8Gw40/U2zReBYA=
770+
k8s.io/kubernetes v1.28.4/go.mod h1:BTzDCKYAlu6LL9ITbfjwgwIrJ30hlTgbv0eXDoA/WoA=
771+
k8s.io/mount-utils v0.28.4 h1:5GOZLm2dXi2fr+MKY8hS6kdV5reXrZBiK7848O5MVD0=
772+
k8s.io/mount-utils v0.28.4/go.mod h1:ceMAZ+Nzlk8zOwN205YXXGJRGmf1o0/XIwsKnG44p0I=
773+
k8s.io/pod-security-admission v0.28.4 h1:b9d6zfKNjkawrO2gF7rBr5XoSZqPfE6UjKLNjgXYrr0=
774+
k8s.io/pod-security-admission v0.28.4/go.mod h1:MVYrZx0Q6ewsZ05Ml2+Ox03HQMAVjO60oombQNmJ44E=
775775
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk=
776776
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
777777
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=

vendor/github.com/google/cel-go/checker/cost.go

Lines changed: 23 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/api/batch/v1/generated.proto

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/api/batch/v1/types.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/apimachinery/pkg/util/runtime/runtime.go

Lines changed: 9 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/mutating/dispatcher.go

Lines changed: 13 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)