Skip to content

Commit

Permalink
Merge pull request #213 from andyzhangx/CVE-2023-2727
Browse files Browse the repository at this point in the history
  • Loading branch information
andyzhangx authored Aug 5, 2023
2 parents 3c473cd + 9d67480 commit 9e19254
Show file tree
Hide file tree
Showing 29 changed files with 554 additions and 337 deletions.
66 changes: 33 additions & 33 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ require (
golang.org/x/net v0.11.0
google.golang.org/grpc v1.56.1
k8s.io/klog/v2 v2.100.1
k8s.io/kubernetes v1.26.5
k8s.io/mount-utils v0.26.0 // indirect
k8s.io/kubernetes v1.26.7
k8s.io/mount-utils v0.26.7 // indirect
)

require (
Expand Down Expand Up @@ -56,11 +56,11 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/api v0.27.0 // indirect
k8s.io/apimachinery v0.27.0 // indirect
k8s.io/apiserver v0.26.0 // indirect
k8s.io/apiserver v0.26.7 // indirect
k8s.io/client-go v0.27.0 // indirect
k8s.io/cloud-provider v0.26.0 // indirect
k8s.io/component-base v0.26.0 // indirect
k8s.io/component-helpers v0.26.0 // indirect
k8s.io/cloud-provider v0.26.7 // indirect
k8s.io/component-base v0.26.7 // indirect
k8s.io/component-helpers v0.26.7 // indirect
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
Expand All @@ -72,56 +72,56 @@ require (
k8s.io/utils v0.0.0-20230209194617-a36077c30491
)

replace k8s.io/api => k8s.io/api v0.26.0
replace k8s.io/api => k8s.io/api v0.26.7

replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.0
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.7

replace k8s.io/apimachinery => k8s.io/apimachinery v0.26.0
replace k8s.io/apimachinery => k8s.io/apimachinery v0.26.7

replace k8s.io/apiserver => k8s.io/apiserver v0.26.0
replace k8s.io/apiserver => k8s.io/apiserver v0.26.7

replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.0
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.7

replace k8s.io/client-go => k8s.io/client-go v0.26.0
replace k8s.io/client-go => k8s.io/client-go v0.26.7

replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.0
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.7

replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.0
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.7

replace k8s.io/code-generator => k8s.io/code-generator v0.26.0
replace k8s.io/code-generator => k8s.io/code-generator v0.26.7

replace k8s.io/component-base => k8s.io/component-base v0.26.0
replace k8s.io/component-base => k8s.io/component-base v0.26.7

replace k8s.io/component-helpers => k8s.io/component-helpers v0.26.0
replace k8s.io/component-helpers => k8s.io/component-helpers v0.26.7

replace k8s.io/controller-manager => k8s.io/controller-manager v0.26.0
replace k8s.io/controller-manager => k8s.io/controller-manager v0.26.7

replace k8s.io/cri-api => k8s.io/cri-api v0.26.0
replace k8s.io/cri-api => k8s.io/cri-api v0.26.7

replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.0
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.7

replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.0
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.7

replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.0
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.7

replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.0
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.7

replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.0
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.7

replace k8s.io/kubectl => k8s.io/kubectl v0.26.0
replace k8s.io/kubectl => k8s.io/kubectl v0.26.7

replace k8s.io/kubelet => k8s.io/kubelet v0.26.0
replace k8s.io/kubelet => k8s.io/kubelet v0.26.7

replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.0
replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.7

replace k8s.io/metrics => k8s.io/metrics v0.26.0
replace k8s.io/metrics => k8s.io/metrics v0.26.7

replace k8s.io/mount-utils => k8s.io/mount-utils v0.26.0
replace k8s.io/mount-utils => k8s.io/mount-utils v0.26.7

replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.0
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.7

replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.0
replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.7

replace k8s.io/sample-controller => k8s.io/sample-controller v0.26.0
replace k8s.io/sample-controller => k8s.io/sample-controller v0.26.7

replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.0
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.7
38 changes: 19 additions & 19 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -274,29 +274,29 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.26.0 h1:IpPlZnxBpV1xl7TGk/X6lFtpgjgntCg8PJ+qrPHAC7I=
k8s.io/api v0.26.0/go.mod h1:k6HDTaIFC8yn1i6pSClSqIwLABIcLV9l5Q4EcngKnQg=
k8s.io/apimachinery v0.26.0 h1:1feANjElT7MvPqp0JT6F3Ss6TWDwmcjLypwoPpEf7zg=
k8s.io/apimachinery v0.26.0/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74=
k8s.io/apiserver v0.26.0 h1:q+LqIK5EZwdznGZb8bq0+a+vCqdeEEe4Ux3zsOjbc4o=
k8s.io/apiserver v0.26.0/go.mod h1:aWhlLD+mU+xRo+zhkvP/gFNbShI4wBDHS33o0+JGI84=
k8s.io/client-go v0.26.0 h1:lT1D3OfO+wIi9UFolCrifbjUUgu7CpLca0AD8ghRLI8=
k8s.io/client-go v0.26.0/go.mod h1:I2Sh57A79EQsDmn7F7ASpmru1cceh3ocVT9KlX2jEZg=
k8s.io/cloud-provider v0.26.0 h1:kO2BIgCou71QNRHGkpFi/8lnas9UIr+fJz1l/nuiOMo=
k8s.io/cloud-provider v0.26.0/go.mod h1:JwfUAH67C8f7t6tOC4v4ty+DuvIYVjNF6bGVYSDCqqs=
k8s.io/component-base v0.26.0 h1:0IkChOCohtDHttmKuz+EP3j3+qKmV55rM9gIFTXA7Vs=
k8s.io/component-base v0.26.0/go.mod h1:lqHwlfV1/haa14F/Z5Zizk5QmzaVf23nQzCwVOQpfC8=
k8s.io/component-helpers v0.26.0 h1:KNgwqs3EUdK0HLfW4GhnbD+q/Zl9U021VfIU7qoVYFk=
k8s.io/component-helpers v0.26.0/go.mod h1:jHN01qS/Jdj95WCbTe9S2VZ9yxpxXNY488WjF+yW4fo=
k8s.io/csi-translation-lib v0.26.0 h1:bCvlfw53Kmyn7cvXeYGe9aqqzR1b0xrGs2XEWHFW+es=
k8s.io/api v0.26.7 h1:Lf4iEBEJb5OFNmawtBfSZV/UNi9riSJ0t1qdhyZqI40=
k8s.io/api v0.26.7/go.mod h1:Vk9bMadzA49UHPmHB//lX7VRCQSXGoVwfLd3Sc1SSXI=
k8s.io/apimachinery v0.26.7 h1:590jSBwaSHCAFCqltaEogY/zybFlhGsnLteLpuF2wig=
k8s.io/apimachinery v0.26.7/go.mod h1:qYzLkrQ9lhrZRh0jNKo2cfvf/R1/kQONnSiyB7NUJU0=
k8s.io/apiserver v0.26.7 h1:NX/zBZZn4R+Cq6shwyn8Pn8REd0yJJ16dbtv9WkEVEU=
k8s.io/apiserver v0.26.7/go.mod h1:r0wDRWHI7VL/KlQLTkJJBVGZ3KeNfv+VetlyRtr86xs=
k8s.io/client-go v0.26.7 h1:hyU9aKHlwVOykgyxzGYkrDSLCc4+mimZVyUJjPyUn1E=
k8s.io/client-go v0.26.7/go.mod h1:okYjy0jtq6sdeztALDvCh24tg4opOQS1XNvsJlERDAo=
k8s.io/cloud-provider v0.26.7 h1:J4wYrZ+pvNMQULvNuChLdYXLGf8veBX+vUVfgwo+eoU=
k8s.io/cloud-provider v0.26.7/go.mod h1:9MqA8lIARGxyNnffsm++P4fpfDttg5BrxeXLMuQVL0o=
k8s.io/component-base v0.26.7 h1:uqsOyZh0Zqoaup8tmHa491D/CvgFdGUs+X2H/inNUKM=
k8s.io/component-base v0.26.7/go.mod h1:CZe1HTmX/DQdeBrb9XYOXzs96jXth8ZbFvhLMsoJLUg=
k8s.io/component-helpers v0.26.7 h1:WWdNnJfRQcsxP1NCcMhGMpi9vdlOKPFzZzx48wREvzE=
k8s.io/component-helpers v0.26.7/go.mod h1:r98dtcDwYAv+awPp9hIS6Y35q+jX4YvpX1egBO0u8hw=
k8s.io/csi-translation-lib v0.26.7 h1:sXFkX6DbUOQWf5peB/iQAUOpmWC8pTSwydTrhSru5EE=
k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a h1:gmovKNur38vgoWfGtP5QOGNOA7ki4n6qNYoFAgMlNvg=
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
k8s.io/kubernetes v1.26.5 h1:hc/lcQCK7J2Q3fOqtU3cD8qJOKpi6oySEHPP39q/R7o=
k8s.io/kubernetes v1.26.5/go.mod h1:nARWq2FQXUzRa+DQfF6hEp0dgZXu61MnjX+aiQaC8lk=
k8s.io/mount-utils v0.26.0 h1:MG5oXE2aF1UHMJ3KFbVtBtiRA4J/2u0sijrkfsoaMwU=
k8s.io/mount-utils v0.26.0/go.mod h1:au99w4FWU5ZWelLb3Yx6kJc8RZ387IyWVM9tN65Yhxo=
k8s.io/kubernetes v1.26.7 h1:524bMbtT/JVip9yO/nm0vrNsS/pswo0BS5U11nvjN6U=
k8s.io/kubernetes v1.26.7/go.mod h1:EBE8dfGfk2sZ3yzZVQjr1wQ/k28/wwaajL/1+77Cjmg=
k8s.io/mount-utils v0.26.7 h1:ZWFWELqEvsvYPhWXGqa2wY3n3JR/ntY1+TK5XsQnRsc=
k8s.io/mount-utils v0.26.7/go.mod h1:S+09/ujdtdKRo3bzSQXonHpIEKc+svPe8SNgBUJBj8E=
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
Expand Down
4 changes: 2 additions & 2 deletions vendor/k8s.io/api/batch/v1/generated.proto

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/k8s.io/api/batch/v1/types.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/k8s.io/api/batch/v1/types_swagger_doc_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions vendor/k8s.io/api/core/v1/generated.proto

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 15 additions & 3 deletions vendor/k8s.io/api/core/v1/types.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/k8s.io/api/core/v1/types_swagger_doc_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion vendor/k8s.io/api/resource/v1alpha1/generated.proto

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion vendor/k8s.io/api/resource/v1alpha1/types.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/k8s.io/apimachinery/pkg/runtime/converter.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 9e19254

Please sign in to comment.