Skip to content

Commit 9d34194

Browse files
andyzhangxandyzhangx
authored
Merge pull request #454 from andyzhangx/CVE-2024-5321
fix: CVE-2024-5321
2 parents e5d3c9c + 4c17a28 commit 9d34194

File tree

21 files changed

+195
-157
lines changed

21 files changed

+195
-157
lines changed

‎go.mod‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ require (
1111
github.com/spf13/pflag v1.0.5
1212
golang.org/x/sys v0.20.0
1313
gopkg.in/yaml.v2 v2.4.0
14-
k8s.io/api v0.27.13
15-
k8s.io/apimachinery v0.27.13
16-
k8s.io/apiserver v0.27.13
17-
k8s.io/client-go v0.27.13
18-
k8s.io/component-base v0.27.13
14+
k8s.io/api v0.27.16
15+
k8s.io/apimachinery v0.27.16
16+
k8s.io/apiserver v0.27.16
17+
k8s.io/client-go v0.27.16
18+
k8s.io/component-base v0.27.16
1919
k8s.io/klog/v2 v2.90.1
20-
k8s.io/kubernetes v1.27.13
20+
k8s.io/kubernetes v1.27.16
2121
k8s.io/pod-security-admission v0.0.0
2222
k8s.io/utils v0.0.0-20230209194617-a36077c30491
2323
sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0
@@ -123,49 +123,49 @@ require (
123123
gopkg.in/warnings.v0 v0.1.1 // indirect
124124
gopkg.in/yaml.v3 v3.0.1 // indirect
125125
k8s.io/apiextensions-apiserver v0.0.0 // indirect
126-
k8s.io/cloud-provider v0.27.13 // indirect
127-
k8s.io/component-helpers v0.27.13 // indirect
128-
k8s.io/controller-manager v0.27.13 // indirect
129-
k8s.io/kms v0.27.13 // indirect
126+
k8s.io/cloud-provider v0.27.16 // indirect
127+
k8s.io/component-helpers v0.27.16 // indirect
128+
k8s.io/controller-manager v0.27.16 // indirect
129+
k8s.io/kms v0.27.16 // indirect
130130
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
131131
k8s.io/kubectl v0.0.0 // indirect
132132
k8s.io/kubelet v0.0.0 // indirect
133133
k8s.io/legacy-cloud-providers v0.0.0 // indirect
134-
k8s.io/mount-utils v0.27.13 // indirect
134+
k8s.io/mount-utils v0.27.16 // indirect
135135
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
136136
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
137137
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
138138
)
139139

140140
replace (
141141
github.com/emicklei/go-restful => github.com/emicklei/go-restful/v3 v3.8.0
142-
k8s.io/api => k8s.io/api v0.27.13
143-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.13
144-
k8s.io/apimachinery => k8s.io/apimachinery v0.27.13
145-
k8s.io/apiserver => k8s.io/apiserver v0.27.13
146-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.13
147-
k8s.io/client-go => k8s.io/client-go v0.27.13
148-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.13
149-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.13
150-
k8s.io/code-generator => k8s.io/code-generator v0.27.13
151-
k8s.io/component-base => k8s.io/component-base v0.27.13
152-
k8s.io/component-helpers => k8s.io/component-helpers v0.27.13
153-
k8s.io/controller-manager => k8s.io/controller-manager v0.27.13
154-
k8s.io/cri-api => k8s.io/cri-api v0.27.13
155-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.13
156-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.27.13
157-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.13
158-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.13
159-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.13
160-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.13
161-
k8s.io/kubectl => k8s.io/kubectl v0.27.13
162-
k8s.io/kubelet => k8s.io/kubelet v0.27.13
163-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.13
164-
k8s.io/metrics => k8s.io/metrics v0.27.13
165-
k8s.io/mount-utils => k8s.io/mount-utils v0.27.13
166-
k8s.io/node-api => k8s.io/node-api v0.27.13
167-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.13
168-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.13
169-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.27.13
170-
k8s.io/sample-controller => k8s.io/sample-controller v0.27.13
142+
k8s.io/api => k8s.io/api v0.27.16
143+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.16
144+
k8s.io/apimachinery => k8s.io/apimachinery v0.27.16
145+
k8s.io/apiserver => k8s.io/apiserver v0.27.16
146+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.16
147+
k8s.io/client-go => k8s.io/client-go v0.27.16
148+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.16
149+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.16
150+
k8s.io/code-generator => k8s.io/code-generator v0.27.16
151+
k8s.io/component-base => k8s.io/component-base v0.27.16
152+
k8s.io/component-helpers => k8s.io/component-helpers v0.27.16
153+
k8s.io/controller-manager => k8s.io/controller-manager v0.27.16
154+
k8s.io/cri-api => k8s.io/cri-api v0.27.16
155+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.16
156+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.27.16
157+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.16
158+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.16
159+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.16
160+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.16
161+
k8s.io/kubectl => k8s.io/kubectl v0.27.16
162+
k8s.io/kubelet => k8s.io/kubelet v0.27.16
163+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.16
164+
k8s.io/metrics => k8s.io/metrics v0.27.16
165+
k8s.io/mount-utils => k8s.io/mount-utils v0.27.16
166+
k8s.io/node-api => k8s.io/node-api v0.27.16
167+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.16
168+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.16
169+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.27.16
170+
k8s.io/sample-controller => k8s.io/sample-controller v0.27.16
171171
)

‎go.sum‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1054,48 +1054,48 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
10541054
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
10551055
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
10561056
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
1057-
k8s.io/api v0.27.13 h1:d49LYs1dh+JMMDNYQSu8FhEzCjc2TNpYvDWoSGAKs80=
1058-
k8s.io/api v0.27.13/go.mod h1:W3lYMPs34i0XQA+cmKfejve+HwbRZjy67fL05RyJUTo=
1059-
k8s.io/apiextensions-apiserver v0.27.13 h1:it32SCkrjzhimZasL++nsshG66m2O570y56R+xj1/WE=
1060-
k8s.io/apiextensions-apiserver v0.27.13/go.mod h1:LkAz0+pjqr/92kPigX/B2sjsPhGCuG+hi8GyyjUNNsE=
1061-
k8s.io/apimachinery v0.27.13 h1:xDAnOWaRVNSkaKdfB0Ab11hixH90KGTbLwEHMloMjFM=
1062-
k8s.io/apimachinery v0.27.13/go.mod h1:TWo+8wOIz3CytsrlI9k/LBWXLRr9dqf5hRSCbbggMAg=
1063-
k8s.io/apiserver v0.27.13 h1:Yf69zVdbuQVIMpz7N4dtntWsUklKpcFXGAdVh7vKOH4=
1064-
k8s.io/apiserver v0.27.13/go.mod h1:XHth2MKAUdcLvdhPOwvDPbSyOrMev2vRqE05oUEC5Hk=
1065-
k8s.io/client-go v0.27.13 h1:SfUbIukb6BSqaadlYRX0AzMoN6+e+9FZGEKqfisidho=
1066-
k8s.io/client-go v0.27.13/go.mod h1:I9SBaI28r6ii465Fb0dTpf5O3adOnDwNBoeqlDNbbFg=
1067-
k8s.io/cloud-provider v0.27.13 h1:iOLPffa1PjCE9SpHIVrMfRQv8bBER+LGjJ3nbl69xkA=
1068-
k8s.io/cloud-provider v0.27.13/go.mod h1:Z6hm5I+K/1yQK4myP/PdP0NorxfM9p8iPEhyGvznw0I=
1069-
k8s.io/component-base v0.27.13 h1:JuDLZqD8L+Wu9nUNv9msjQjkh172Ag6crphzASEvlKo=
1070-
k8s.io/component-base v0.27.13/go.mod h1:QKur/xRE4R25PhScEe3lAhrVSwEuZPGlFPyEDOaWCgU=
1071-
k8s.io/component-helpers v0.27.13 h1:o2pj2ycWJw8f+Gjh66GrvSk6Oz1jsd9GNr/IqaclSyw=
1072-
k8s.io/component-helpers v0.27.13/go.mod h1:fbi9kk3Y2lypTKOSiIpTmYGLj1CsVO7BmSIa0dq28ao=
1073-
k8s.io/controller-manager v0.27.13 h1:/vw2Bd4glt10N+cRejsVLDkJNCS9zqecX9Imjwv7JZE=
1074-
k8s.io/controller-manager v0.27.13/go.mod h1:sM53BuXjOHuL5CnKmynSDfmIGy/kPzA3o450uSziIn0=
1075-
k8s.io/csi-translation-lib v0.27.13 h1:Fu1f/gsWGEqlwW7kYaDH65v9RU7T3+fSqQNk9WzSFgQ=
1057+
k8s.io/api v0.27.16 h1:70IBoTuiPfd+Tm68WH0tGXQRSQq0R1xnbyhTRe8WYQY=
1058+
k8s.io/api v0.27.16/go.mod h1:5j0Cgo6X4qovBOu3OjzRwETDEYqMxq2qafhDQXOPy3A=
1059+
k8s.io/apiextensions-apiserver v0.27.16 h1:gJ0sEbfYmvgdysC2WjkeYujvjmWAyPH6e8ANVAL5qxk=
1060+
k8s.io/apiextensions-apiserver v0.27.16/go.mod h1:wq5IgoFVjYyJqqcjD+R+/opZJxBQcu9PIcFWJ8eaQLQ=
1061+
k8s.io/apimachinery v0.27.16 h1:Nmbei3P/6w6vxbNxV8/sDCZz+TQrJ9A4+bVIRjDufuM=
1062+
k8s.io/apimachinery v0.27.16/go.mod h1:TWo+8wOIz3CytsrlI9k/LBWXLRr9dqf5hRSCbbggMAg=
1063+
k8s.io/apiserver v0.27.16 h1:s3+lMqISTj5l/ZH/BvhdbiMfIoTF3/lrAN99BHccLmk=
1064+
k8s.io/apiserver v0.27.16/go.mod h1:xwxM8/bcAtgkWqbsGwMQjImIC5Jik7a4pHRptEDqQf0=
1065+
k8s.io/client-go v0.27.16 h1:x06Jk6/SIQQ6kAsWs5uzQIkBLHtcAQlbTAgmj1tZzG0=
1066+
k8s.io/client-go v0.27.16/go.mod h1:bPZUNRj8XsHa+JVS5jU6qeU2H/Za8+7riWA08FUjaA8=
1067+
k8s.io/cloud-provider v0.27.16 h1:DPWnVrouMaBdwQJkMj7/cf3zyNsqPYEPXhRkQtZ3s9U=
1068+
k8s.io/cloud-provider v0.27.16/go.mod h1:XgbHhQ7Z+57xaRvxxVSq2tWC00cT1SO74mLBop8SOTk=
1069+
k8s.io/component-base v0.27.16 h1:CpPBD1GIwsaRdDF0WzJkIppakYJwQCvsKK8exRxe9rY=
1070+
k8s.io/component-base v0.27.16/go.mod h1:g636fljq9A7zsIB0nRE4fgmBCo8aqjoJe1aLkCX0Vwc=
1071+
k8s.io/component-helpers v0.27.16 h1:7ulLXd43EYGIN200/ARhNxhmGJJMNrkxtd7nZwqJuBM=
1072+
k8s.io/component-helpers v0.27.16/go.mod h1:zx8ypRCqOvRH/gB8aRCLqJWU98A3sYYMG2fU1d5/Qqg=
1073+
k8s.io/controller-manager v0.27.16 h1:3TbbII/lnKbOwk64uCD1uUJqAEYD1zuz9LAC8et76WQ=
1074+
k8s.io/controller-manager v0.27.16/go.mod h1:EQVxw6KP3WPV/0Y43ycsGwlzW6eH5hVprLyfwK8echc=
1075+
k8s.io/csi-translation-lib v0.27.16 h1:6DCkJ0SoiSMmAdWDXE7FmOieCIabPkS4or2vDI5JUPE=
10761076
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
10771077
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
10781078
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
10791079
k8s.io/klog/v2 v2.3.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
10801080
k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
10811081
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
10821082
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
1083-
k8s.io/kms v0.27.13 h1:mm0njb9VaDh2TNanqndUWGpe4c2elQbkPofoGPOalvM=
1084-
k8s.io/kms v0.27.13/go.mod h1:g3rvv+YDJ5xVEanhlnliJw4a9vZ/SL/AVw0/yQNwbEA=
1083+
k8s.io/kms v0.27.16 h1:Zso2+ixKQzz/N9b8q9MrFKHv2Fu7jb+0Zvu+iLWAUME=
1084+
k8s.io/kms v0.27.16/go.mod h1:BQf/ALdGhPhqoc1q81A7WdWpjrZ6jCSfePCNecz1AW8=
10851085
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg=
10861086
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg=
1087-
k8s.io/kubectl v0.27.13 h1:RuygTTIy/FFotjI5kBA/DRamU9kSbCjUVlqd8Ni/U94=
1088-
k8s.io/kubectl v0.27.13/go.mod h1:wAoY7J5QWMX6xzeQ/rw9kZpadB4zUVePu1WzGv1GBsw=
1089-
k8s.io/kubelet v0.27.13 h1:tQ4bG3gfValJZDkVBCrnWrLbBRRlE3rA8gtC9LgTAag=
1090-
k8s.io/kubelet v0.27.13/go.mod h1:5QjeSJXimzRA+avdgsi3mSNyo09JH/6fmgGe2aOPRoA=
1091-
k8s.io/kubernetes v1.27.13 h1:5NBz3aNy5Jwcgi+w2+rP4x5B0Wa21NXUJxDJwdUtxlY=
1092-
k8s.io/kubernetes v1.27.13/go.mod h1:T4toI2XSWG5FJoq/H8q9eFYPymAxe/k4UnaC00uPnMs=
1093-
k8s.io/legacy-cloud-providers v0.27.13 h1:XPdemkR1u8EokSR7bDNGzbMXrV+MFyIT7ZGyZ1uKtt8=
1094-
k8s.io/legacy-cloud-providers v0.27.13/go.mod h1:Gf9Tpuxc2CuCUxFHjW6mJbfyhYa3vBkwk9B7YBHT6+8=
1095-
k8s.io/mount-utils v0.27.13 h1:t6CcZlo+UZ5G38BN1UkT6IMJUpX2qMQvDxab/2jR4Es=
1096-
k8s.io/mount-utils v0.27.13/go.mod h1:bBE748kmEaM5B38hXaPJjlVeoAtHxHg/aizoiqm+6OI=
1097-
k8s.io/pod-security-admission v0.27.13 h1:B3sSlxhQZiPuEj6dD8Mc1oyjWR3/nUVZ9qXTvD1BOj0=
1098-
k8s.io/pod-security-admission v0.27.13/go.mod h1:d0ms/UYCmD0O28MA0MngozhKouM5xsKXFav4VGOpLr8=
1087+
k8s.io/kubectl v0.27.16 h1:lcsr0VokO7UWbTKTZG1t5jPlWAT62/RPFBfGq7WPdsw=
1088+
k8s.io/kubectl v0.27.16/go.mod h1:2oG5aJh0qRtUazp5dU2ilDnRJtPUNhaiYP1mo4ot7xY=
1089+
k8s.io/kubelet v0.27.16 h1:ubei/gPi92hFYIc+lN8FNPifDzfZssrBl4M1yC64TgQ=
1090+
k8s.io/kubelet v0.27.16/go.mod h1:+aFHesx5Swb/I1KEkEaK235MGpaxNcIBxLWrxWiO6T4=
1091+
k8s.io/kubernetes v1.27.16 h1:DHFqj/HTUqHStFlRH9wCKPocqgHsjR6Q/DzYarB2QQE=
1092+
k8s.io/kubernetes v1.27.16/go.mod h1:T4toI2XSWG5FJoq/H8q9eFYPymAxe/k4UnaC00uPnMs=
1093+
k8s.io/legacy-cloud-providers v0.27.16 h1:sKjWW8MQy9IUsdqv+dl9rEa/a4cR8H3LmJw2iBYbXAI=
1094+
k8s.io/legacy-cloud-providers v0.27.16/go.mod h1:ptrEAxtOobaIT5agAKndYsF9hkcJOr4NIuTJUode23I=
1095+
k8s.io/mount-utils v0.27.16 h1:pvt8J9jW1xlt7R9RM8SKwVo1ya994Kz9qADEmW6WcWg=
1096+
k8s.io/mount-utils v0.27.16/go.mod h1:bBE748kmEaM5B38hXaPJjlVeoAtHxHg/aizoiqm+6OI=
1097+
k8s.io/pod-security-admission v0.27.16 h1:CZqa4a40Gg3XvrJhST/7rUPGPj8fzRkT7tMLqpe5gOY=
1098+
k8s.io/pod-security-admission v0.27.16/go.mod h1:dTZsLwiRlkgywGU6jl+Armj8Bf65za4Y/NbZYmfwIII=
10991099
k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
11001100
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
11011101
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=

‎vendor/k8s.io/cloud-provider/cloud.go‎

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

‎vendor/k8s.io/kubernetes/test/e2e/storage/utils/create.go‎

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

‎vendor/k8s.io/kubernetes/test/e2e/testing-manifests/storage-csi/external-attacher/rbac.yaml‎

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

‎vendor/k8s.io/kubernetes/test/e2e/testing-manifests/storage-csi/external-health-monitor/external-health-monitor-controller/rbac.yaml‎

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

‎vendor/k8s.io/kubernetes/test/e2e/testing-manifests/storage-csi/external-provisioner/rbac.yaml‎

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

‎vendor/k8s.io/kubernetes/test/e2e/testing-manifests/storage-csi/external-resizer/rbac.yaml‎

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

‎vendor/k8s.io/kubernetes/test/e2e/testing-manifests/storage-csi/external-snapshotter/csi-snapshotter/rbac-csi-snapshotter.yaml‎

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

‎vendor/k8s.io/kubernetes/test/e2e/testing-manifests/storage-csi/hostpath/README.md‎

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

0 commit comments

Comments
 (0)