From 805a564e9b62cb44f13122d6dd92bbd348d6a511 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Thu, 28 Aug 2025 01:48:14 +0000 Subject: [PATCH] fix: CVE-2025-5187 --- go.mod | 86 +++++++-------- go.sum | 72 ++++++------- .../component-helpers/resource/helpers.go | 7 +- .../kubernetes/test/utils/image/manifest.go | 29 ++--- vendor/modules.txt | 100 +++++++++--------- 5 files changed, 152 insertions(+), 142 deletions(-) diff --git a/go.mod b/go.mod index 730eecf06..30608dcac 100644 --- a/go.mod +++ b/go.mod @@ -31,13 +31,13 @@ require ( golang.org/x/sync v0.16.0 google.golang.org/grpc v1.68.1 google.golang.org/protobuf v1.36.7 - k8s.io/api v0.33.2 - k8s.io/apimachinery v0.33.2 - k8s.io/apiserver v0.33.2 - k8s.io/client-go v0.33.2 - k8s.io/component-base v0.33.2 + k8s.io/api v0.33.4 + k8s.io/apimachinery v0.33.4 + k8s.io/apiserver v0.33.4 + k8s.io/client-go v0.33.4 + k8s.io/component-base v0.33.4 k8s.io/klog/v2 v2.130.1 - k8s.io/kubernetes v1.33.2 + k8s.io/kubernetes v1.33.4 k8s.io/mount-utils v0.33.4 k8s.io/pod-security-admission v0.31.1 k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979 @@ -169,17 +169,17 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiextensions-apiserver v0.0.0 // indirect - k8s.io/cloud-provider v0.33.2 // indirect - k8s.io/component-helpers v0.33.2 // indirect - k8s.io/controller-manager v0.33.2 // indirect - k8s.io/cri-api v0.33.2 // indirect + k8s.io/cloud-provider v0.33.4 // indirect + k8s.io/component-helpers v0.33.4 // indirect + k8s.io/controller-manager v0.33.4 // indirect + k8s.io/cri-api v0.33.4 // indirect k8s.io/cri-client v0.0.0 // indirect k8s.io/csi-translation-lib v0.0.0 // indirect k8s.io/dynamic-resource-allocation v0.0.0 // indirect k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect k8s.io/kube-scheduler v0.0.0 // indirect k8s.io/kubectl v0.31.1 // indirect - k8s.io/kubelet v0.33.2 // indirect + k8s.io/kubelet v0.33.4 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect sigs.k8s.io/cloud-provider-azure/pkg/azclient/cache v0.7.3 // indirect sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect @@ -189,36 +189,36 @@ require ( replace ( github.com/pmezard/go-difflib => github.com/pmezard/go-difflib v1.0.0 // indirect - k8s.io/api => k8s.io/api v0.33.2 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.33.2 - k8s.io/apimachinery => k8s.io/apimachinery v0.33.2 - k8s.io/apiserver => k8s.io/apiserver v0.33.2 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.33.2 - k8s.io/client-go => k8s.io/client-go v0.33.2 - k8s.io/cloud-provider => k8s.io/cloud-provider v0.33.2 - k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.33.2 - k8s.io/code-generator => k8s.io/code-generator v0.33.2 - k8s.io/component-base => k8s.io/component-base v0.33.2 - k8s.io/component-helpers => k8s.io/component-helpers v0.33.2 - k8s.io/controller-manager => k8s.io/controller-manager v0.33.2 - k8s.io/cri-api => k8s.io/cri-api v0.33.2 - k8s.io/cri-client => k8s.io/cri-client v0.33.2 - k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.33.2 - k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.33.2 - k8s.io/endpointslice => k8s.io/endpointslice v0.33.2 - k8s.io/externaljwt => k8s.io/externaljwt v0.33.2 - k8s.io/kms => k8s.io/kms v0.33.2 - k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.33.2 - k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.33.2 - k8s.io/kube-proxy => k8s.io/kube-proxy v0.33.2 - k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.33.2 - k8s.io/kubectl => k8s.io/kubectl v0.33.2 - k8s.io/kubelet => k8s.io/kubelet v0.33.2 - k8s.io/kubernetes => k8s.io/kubernetes v1.33.2 - k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.33.2 - k8s.io/metrics => k8s.io/metrics v0.33.2 - k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.33.2 - k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.33.2 - k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.33.2 - k8s.io/sample-controller => k8s.io/sample-controller v0.33.2 + k8s.io/api => k8s.io/api v0.33.4 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.33.4 + k8s.io/apimachinery => k8s.io/apimachinery v0.33.4 + k8s.io/apiserver => k8s.io/apiserver v0.33.4 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.33.4 + k8s.io/client-go => k8s.io/client-go v0.33.4 + k8s.io/cloud-provider => k8s.io/cloud-provider v0.33.4 + k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.33.4 + k8s.io/code-generator => k8s.io/code-generator v0.33.4 + k8s.io/component-base => k8s.io/component-base v0.33.4 + k8s.io/component-helpers => k8s.io/component-helpers v0.33.4 + k8s.io/controller-manager => k8s.io/controller-manager v0.33.4 + k8s.io/cri-api => k8s.io/cri-api v0.33.4 + k8s.io/cri-client => k8s.io/cri-client v0.33.4 + k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.33.4 + k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.33.4 + k8s.io/endpointslice => k8s.io/endpointslice v0.33.4 + k8s.io/externaljwt => k8s.io/externaljwt v0.33.4 + k8s.io/kms => k8s.io/kms v0.33.4 + k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.33.4 + k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.33.4 + k8s.io/kube-proxy => k8s.io/kube-proxy v0.33.4 + k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.33.4 + k8s.io/kubectl => k8s.io/kubectl v0.33.4 + k8s.io/kubelet => k8s.io/kubelet v0.33.4 + k8s.io/kubernetes => k8s.io/kubernetes v1.33.4 + k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.33.4 + k8s.io/metrics => k8s.io/metrics v0.33.4 + k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.33.4 + k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.33.4 + k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.33.4 + k8s.io/sample-controller => k8s.io/sample-controller v0.33.4 ) diff --git a/go.sum b/go.sum index 2d3fb826e..1bd616c78 100644 --- a/go.sum +++ b/go.sum @@ -435,48 +435,48 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.33.2 h1:YgwIS5jKfA+BZg//OQhkJNIfie/kmRsO0BmNaVSimvY= -k8s.io/api v0.33.2/go.mod h1:fhrbphQJSM2cXzCWgqU29xLDuks4mu7ti9vveEnpSXs= -k8s.io/apiextensions-apiserver v0.33.2 h1:6gnkIbngnaUflR3XwE1mCefN3YS8yTD631JXQhsU6M8= -k8s.io/apiextensions-apiserver v0.33.2/go.mod h1:IvVanieYsEHJImTKXGP6XCOjTwv2LUMos0YWc9O+QP8= -k8s.io/apimachinery v0.33.2 h1:IHFVhqg59mb8PJWTLi8m1mAoepkUNYmptHsV+Z1m5jY= -k8s.io/apimachinery v0.33.2/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM= -k8s.io/apiserver v0.33.2 h1:KGTRbxn2wJagJowo29kKBp4TchpO1DRO3g+dB/KOJN4= -k8s.io/apiserver v0.33.2/go.mod h1:9qday04wEAMLPWWo9AwqCZSiIn3OYSZacDyu/AcoM/M= -k8s.io/client-go v0.33.2 h1:z8CIcc0P581x/J1ZYf4CNzRKxRvQAwoAolYPbtQes+E= -k8s.io/client-go v0.33.2/go.mod h1:9mCgT4wROvL948w6f6ArJNb7yQd7QsvqavDeZHvNmHo= -k8s.io/cloud-provider v0.33.2 h1:tP/18SbhytAapqg2/tGD5PFUR6VLYra+QfJ7Qn3FN34= -k8s.io/cloud-provider v0.33.2/go.mod h1:yS8ArLLLZV1+Tv6hkSYrZuYEVz+wQgiekUtaqe9Wxao= -k8s.io/component-base v0.33.2 h1:sCCsn9s/dG3ZrQTX/Us0/Sx2R0G5kwa0wbZFYoVp/+0= -k8s.io/component-base v0.33.2/go.mod h1:/41uw9wKzuelhN+u+/C59ixxf4tYQKW7p32ddkYNe2k= -k8s.io/component-helpers v0.33.2 h1:AjCtYzst11NV8ensxV/2LEEXRwctqS7Bs44bje9Qcnw= -k8s.io/component-helpers v0.33.2/go.mod h1:PsPpiCk74n8pGWp1d6kjK/iSKBTyQfIacv02BNkMenU= -k8s.io/controller-manager v0.33.2 h1:HIs8PbdTOaY6wTOvKKLwoAHSO6GeDjmYS0Gjnd6rF+c= -k8s.io/controller-manager v0.33.2/go.mod h1:n8maAdN06E3cD0h5N0wuYBv9Qi9FePl7y6Iz3pfc9PY= -k8s.io/cri-api v0.33.2 h1:1OiWm6gUx7JrN+xqxMzGDCPfPxVT8b6n7B6SeYl5luM= -k8s.io/cri-api v0.33.2/go.mod h1:OLQvT45OpIA+tv91ZrpuFIGY+Y2Ho23poS7n115Aocs= -k8s.io/cri-client v0.33.2 h1:EostRehqo+XunR5soCzsa1uX55T0DaZ7H5q9wfMvIVE= -k8s.io/cri-client v0.33.2/go.mod h1:tQ9LvA9X88+fzGu+vAKUs7ITkB5O4ng6lHnezSZVl90= -k8s.io/csi-translation-lib v0.33.2 h1:QyWkVcf0rbNjc53uAqCyl9kmHCRn1O0Z4QT69y/jwHQ= -k8s.io/csi-translation-lib v0.33.2/go.mod h1:nFPX6BA20EDdIQpitb6p2wVtvLBuXsmm6D1Cwi3rDnE= -k8s.io/dynamic-resource-allocation v0.33.2 h1:dG5HmIveq5wl3bTEJrtkZfIeGcfVGlZ1ysuzOovXOqk= -k8s.io/dynamic-resource-allocation v0.33.2/go.mod h1:/q49Z4qw3mpRB77Cgl2ACTLS9xrR7U82wZvsFl3biuE= +k8s.io/api v0.33.4 h1:oTzrFVNPXBjMu0IlpA2eDDIU49jsuEorGHB4cvKupkk= +k8s.io/api v0.33.4/go.mod h1:VHQZ4cuxQ9sCUMESJV5+Fe8bGnqAARZ08tSTdHWfeAc= +k8s.io/apiextensions-apiserver v0.33.4 h1:rtq5SeXiDbXmSwxsF0MLe2Mtv3SwprA6wp+5qh/CrOU= +k8s.io/apiextensions-apiserver v0.33.4/go.mod h1:mWXcZQkQV1GQyxeIjYApuqsn/081hhXPZwZ2URuJeSs= +k8s.io/apimachinery v0.33.4 h1:SOf/JW33TP0eppJMkIgQ+L6atlDiP/090oaX0y9pd9s= +k8s.io/apimachinery v0.33.4/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM= +k8s.io/apiserver v0.33.4 h1:6N0TEVA6kASUS3owYDIFJjUH6lgN8ogQmzZvaFFj1/Y= +k8s.io/apiserver v0.33.4/go.mod h1:8ODgXMnOoSPLMUg1aAzMFx+7wTJM+URil+INjbTZCok= +k8s.io/client-go v0.33.4 h1:TNH+CSu8EmXfitntjUPwaKVPN0AYMbc9F1bBS8/ABpw= +k8s.io/client-go v0.33.4/go.mod h1:LsA0+hBG2DPwovjd931L/AoaezMPX9CmBgyVyBZmbCY= +k8s.io/cloud-provider v0.33.4 h1:et4DyeV0W8W+m2ByS34VVFMg8Aj0sz+UDVwanNkspTo= +k8s.io/cloud-provider v0.33.4/go.mod h1:cAC2s7mGpqVWwUars8TFgnvgXy+trDOF3+WSeKNsy/M= +k8s.io/component-base v0.33.4 h1:Jvb/aw/tl3pfgnJ0E0qPuYLT0NwdYs1VXXYQmSuxJGY= +k8s.io/component-base v0.33.4/go.mod h1:567TeSdixWW2Xb1yYUQ7qk5Docp2kNznKL87eygY8Rc= +k8s.io/component-helpers v0.33.4 h1:DYHQPxWB3XIk7hwAQ4YczUelJ37PcUHfnLeee0qFqV8= +k8s.io/component-helpers v0.33.4/go.mod h1:kRgidIgCKFqOW/wy7D8IL3YOT3iaIRZu6FcTEyRr7WU= +k8s.io/controller-manager v0.33.4 h1:HmlzmmNPu8H+cKEpAIRz0ptqpveKcj7KrCx9G+HXRAg= +k8s.io/controller-manager v0.33.4/go.mod h1:CpO8RarLcs7zh0sE4pqz88quF3xU3Dc4ZDfshnB8hw4= +k8s.io/cri-api v0.33.4 h1:P49b1XSTqIKu79pTV6Ig+tMM20NupmZ8AVZ9rWSz1VQ= +k8s.io/cri-api v0.33.4/go.mod h1:OLQvT45OpIA+tv91ZrpuFIGY+Y2Ho23poS7n115Aocs= +k8s.io/cri-client v0.33.4 h1:WPZjjU7sA6i5pululXbatDeIYvNDFMtX5qK/YkfFG30= +k8s.io/cri-client v0.33.4/go.mod h1:/v6lx4bfth4SYFdC2N1nPERn8+eHGNC5924IPL8VsCw= +k8s.io/csi-translation-lib v0.33.4 h1:LmiElxqQwISv0c2mdL3rswmPIIN6Qh+4Lv0bdKTTFoM= +k8s.io/csi-translation-lib v0.33.4/go.mod h1:A4Kn6gTWX5EkxbHgtiDitNjDVvk2plie7lo8Hpa19Bg= +k8s.io/dynamic-resource-allocation v0.33.4 h1:CzGpfPS14cj7W7FIaCcOG0S01UDmi52AxtNjU0YGSRM= +k8s.io/dynamic-resource-allocation v0.33.4/go.mod h1:3dtKRcjPY6XRhgOpsToIy/o2VffPdf647Iaro10rs9k= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4= k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8= -k8s.io/kube-scheduler v0.33.2 h1:B6W7oldVnH6aIGAxh7HNHIV2YoPOoAUzqzlzUJsg/B0= -k8s.io/kube-scheduler v0.33.2/go.mod h1:+1TrLmFINNQdEKGtxkgs0KY/5vDeOYIpiysMcVHwjls= -k8s.io/kubectl v0.33.2 h1:7XKZ6DYCklu5MZQzJe+CkCjoGZwD1wWl7t/FxzhMz7Y= -k8s.io/kubectl v0.33.2/go.mod h1:8rC67FB8tVTYraovAGNi/idWIK90z2CHFNMmGJZJ3KI= -k8s.io/kubelet v0.33.2 h1:wxEau5/563oJb3j3KfrCKlNWWx35YlSgDLOYUBCQ0pg= -k8s.io/kubelet v0.33.2/go.mod h1:way8VCDTUMiX1HTOvJv7M3xS/xNysJI6qh7TOqMe5KM= -k8s.io/kubernetes v1.33.2 h1:Vk3hsCaazyMQ6CXhu029AEPlBoYsEnD8oEIC0bP2pWQ= -k8s.io/kubernetes v1.33.2/go.mod h1:nrt8sldmckKz2fCZhgRX3SKfS2e+CzXATPv6ITNkU00= +k8s.io/kube-scheduler v0.33.4 h1:RNlrqBL0lyILGCsD78xcuaDqAIfccL2j5g+eVJntWL8= +k8s.io/kube-scheduler v0.33.4/go.mod h1:bNYhEZ0GAj5wbnWa8B3Bu1AqlE9nLacFoezpEtSSqik= +k8s.io/kubectl v0.33.4 h1:nXEI6Vi+oB9hXxoAHyHisXolm/l1qutK3oZQMak4N98= +k8s.io/kubectl v0.33.4/go.mod h1:Xe7P9X4DfILvKmlBsVqUtzktkI56lEj22SJW7cFy6nE= +k8s.io/kubelet v0.33.4 h1:+sbpLmSq+Y8DF/OQeyw75OpuiF60tvlYcmc/yjN+nl4= +k8s.io/kubelet v0.33.4/go.mod h1:wboarviFRQld5rzZUjTliv7x00YVx+YhRd/p1OahX7Y= +k8s.io/kubernetes v1.33.4 h1:T1d5FLUYm3/KyUeV7YJhKTR980zHCHb7K2xhCSo3lE8= +k8s.io/kubernetes v1.33.4/go.mod h1:nrt8sldmckKz2fCZhgRX3SKfS2e+CzXATPv6ITNkU00= k8s.io/mount-utils v0.33.4 h1:o83Qx0AgY5JDYhFV6gAYfSy+GAPIuPqSKdEqac5lxqo= k8s.io/mount-utils v0.33.4/go.mod h1:1JR4rKymg8B8bCPo618hpSAdrpO6XLh0Acqok/xVwPE= -k8s.io/pod-security-admission v0.33.2 h1:XRm2Q50aFtB61qVG1Fqyn3sw1A4RaFL4HRzF3LOAq/M= -k8s.io/pod-security-admission v0.33.2/go.mod h1:e6wsjnmzRbmdp6JWoXJeXqQ1iex5N4h2dke/TH1Jros= +k8s.io/pod-security-admission v0.33.4 h1:adSwY7a/Q4Eoj+uCUfav90xRe6mB8waF0HAZ4gZeWD0= +k8s.io/pod-security-admission v0.33.4/go.mod h1:K+4JaqBz5yqE7TXf3g5zEiBLcu9RdW2BjTWydFEror4= k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979 h1:jgJW5IePPXLGB8e/1wvd0Ich9QE97RvvF3a8J3fP/Lg= k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM= diff --git a/vendor/k8s.io/component-helpers/resource/helpers.go b/vendor/k8s.io/component-helpers/resource/helpers.go index 780db5424..7ff5bef11 100644 --- a/vendor/k8s.io/component-helpers/resource/helpers.go +++ b/vendor/k8s.io/component-helpers/resource/helpers.go @@ -404,7 +404,12 @@ func maxResourceList(list, newList v1.ResourceList) { // max returns the result of max(a, b...) for each named resource and is only used if we can't // accumulate into an existing resource list func max(a v1.ResourceList, b ...v1.ResourceList) v1.ResourceList { - result := a.DeepCopy() + var result v1.ResourceList + if a != nil { + result = a.DeepCopy() + } else { + result = v1.ResourceList{} + } for _, other := range b { maxResourceList(result, other) } diff --git a/vendor/k8s.io/kubernetes/test/utils/image/manifest.go b/vendor/k8s.io/kubernetes/test/utils/image/manifest.go index 7574ceaf6..dae697066 100644 --- a/vendor/k8s.io/kubernetes/test/utils/image/manifest.go +++ b/vendor/k8s.io/kubernetes/test/utils/image/manifest.go @@ -129,13 +129,17 @@ func readFromURL(url string, writer io.Writer) error { var ( initRegistry = RegistryList{ - GcAuthenticatedRegistry: "gcr.io/authenticated-image-pulling", - PromoterE2eRegistry: "registry.k8s.io/e2e-test-images", - BuildImageRegistry: "registry.k8s.io/build-image", - InvalidRegistry: "invalid.registry.k8s.io/invalid", - GcEtcdRegistry: "registry.k8s.io", - GcRegistry: "registry.k8s.io", - SigStorageRegistry: "registry.k8s.io/sig-storage", + // TODO: https://github.com/kubernetes/kubernetes/issues/130271 + // Eliminate GcAuthenticatedRegistry. + GcAuthenticatedRegistry: "gcr.io/authenticated-image-pulling", + PromoterE2eRegistry: "registry.k8s.io/e2e-test-images", + BuildImageRegistry: "registry.k8s.io/build-image", + InvalidRegistry: "invalid.registry.k8s.io/invalid", + GcEtcdRegistry: "registry.k8s.io", + GcRegistry: "registry.k8s.io", + SigStorageRegistry: "registry.k8s.io/sig-storage", + // TODO: https://github.com/kubernetes/kubernetes/issues/130271 + // Eliminate PrivateRegistry. PrivateRegistry: "gcr.io/k8s-authenticated-test", DockerLibraryRegistry: "docker.io/library", CloudProviderGcpRegistry: "registry.k8s.io/cloud-provider-gcp", @@ -152,15 +156,17 @@ const ( // Agnhost image Agnhost // AgnhostPrivate image + // TODO: https://github.com/kubernetes/kubernetes/issues/130271 + // Eliminate this. AgnhostPrivate // APIServer image APIServer // AppArmorLoader image AppArmorLoader // AuthenticatedAlpine image + // TODO: https://github.com/kubernetes/kubernetes/issues/130271 + // Eliminate this. AuthenticatedAlpine - // AuthenticatedWindowsNanoServer image - AuthenticatedWindowsNanoServer // BusyBox image BusyBox // DistrolessIptables Image @@ -219,11 +225,10 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config configs[Agnhost] = Config{list.PromoterE2eRegistry, "agnhost", "2.53"} configs[AgnhostPrivate] = Config{list.PrivateRegistry, "agnhost", "2.6"} configs[AuthenticatedAlpine] = Config{list.GcAuthenticatedRegistry, "alpine", "3.7"} - configs[AuthenticatedWindowsNanoServer] = Config{list.GcAuthenticatedRegistry, "windows-nanoserver", "v1"} configs[APIServer] = Config{list.PromoterE2eRegistry, "sample-apiserver", "1.29.2"} configs[AppArmorLoader] = Config{list.PromoterE2eRegistry, "apparmor-loader", "1.4"} configs[BusyBox] = Config{list.PromoterE2eRegistry, "busybox", "1.36.1-1"} - configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.7.6"} + configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.7.7"} configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.21-0"} configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-4"} configs[HttpdNew] = Config{list.PromoterE2eRegistry, "httpd", "2.4.39-4"} @@ -270,7 +275,7 @@ func GetMappedImageConfigs(originalImageConfigs map[ImageID]Config, repo string) for i, config := range originalImageConfigs { switch i { case InvalidRegistryImage, AuthenticatedAlpine, - AuthenticatedWindowsNanoServer, AgnhostPrivate: + AgnhostPrivate: // These images are special and can't be run out of the cloud - some because they // are authenticated, and others because they are not real images. Tests that depend // on these images can't be run without access to the public internet. diff --git a/vendor/modules.txt b/vendor/modules.txt index ec21f3e0f..687bc7f4f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -855,7 +855,7 @@ gopkg.in/inf.v0 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.33.2 => k8s.io/api v0.33.2 +# k8s.io/api v0.33.4 => k8s.io/api v0.33.4 ## explicit; go 1.24.0 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -917,12 +917,12 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 k8s.io/api/storagemigration/v1alpha1 -# k8s.io/apiextensions-apiserver v0.0.0 => k8s.io/apiextensions-apiserver v0.33.2 +# k8s.io/apiextensions-apiserver v0.0.0 => k8s.io/apiextensions-apiserver v0.33.4 ## explicit; go 1.24.0 k8s.io/apiextensions-apiserver/pkg/apis/apiextensions k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1 k8s.io/apiextensions-apiserver/pkg/features -# k8s.io/apimachinery v0.33.2 => k8s.io/apimachinery v0.33.2 +# k8s.io/apimachinery v0.33.4 => k8s.io/apimachinery v0.33.4 ## explicit; go 1.24.0 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -993,7 +993,7 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/apiserver v0.33.2 => k8s.io/apiserver v0.33.2 +# k8s.io/apiserver v0.33.4 => k8s.io/apiserver v0.33.4 ## explicit; go 1.24.0 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/configuration @@ -1051,7 +1051,7 @@ k8s.io/apiserver/pkg/util/feature k8s.io/apiserver/pkg/util/webhook k8s.io/apiserver/pkg/util/x509metrics k8s.io/apiserver/pkg/warning -# k8s.io/client-go v0.33.2 => k8s.io/client-go v0.33.2 +# k8s.io/client-go v0.33.4 => k8s.io/client-go v0.33.4 ## explicit; go 1.24.0 k8s.io/client-go/applyconfigurations k8s.io/client-go/applyconfigurations/admissionregistration/v1 @@ -1403,7 +1403,7 @@ k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/watchlist k8s.io/client-go/util/workqueue -# k8s.io/cloud-provider v0.33.2 => k8s.io/cloud-provider v0.33.2 +# k8s.io/cloud-provider v0.33.4 => k8s.io/cloud-provider v0.33.4 ## explicit; go 1.24.0 k8s.io/cloud-provider k8s.io/cloud-provider/api @@ -1411,7 +1411,7 @@ k8s.io/cloud-provider/node/helpers k8s.io/cloud-provider/service/helpers k8s.io/cloud-provider/volume k8s.io/cloud-provider/volume/helpers -# k8s.io/component-base v0.33.2 => k8s.io/component-base v0.33.2 +# k8s.io/component-base v0.33.4 => k8s.io/component-base v0.33.4 ## explicit; go 1.24.0 k8s.io/component-base/cli/flag k8s.io/component-base/compatibility @@ -1435,7 +1435,7 @@ k8s.io/component-base/tracing k8s.io/component-base/tracing/api/v1 k8s.io/component-base/version k8s.io/component-base/zpages/features -# k8s.io/component-helpers v0.33.2 => k8s.io/component-helpers v0.33.2 +# k8s.io/component-helpers v0.33.4 => k8s.io/component-helpers v0.33.4 ## explicit; go 1.24.0 k8s.io/component-helpers/node/topology k8s.io/component-helpers/node/util @@ -1445,24 +1445,24 @@ k8s.io/component-helpers/scheduling/corev1 k8s.io/component-helpers/scheduling/corev1/nodeaffinity k8s.io/component-helpers/storage/ephemeral k8s.io/component-helpers/storage/volume -# k8s.io/controller-manager v0.33.2 => k8s.io/controller-manager v0.33.2 +# k8s.io/controller-manager v0.33.4 => k8s.io/controller-manager v0.33.4 ## explicit; go 1.24.0 k8s.io/controller-manager/pkg/features -# k8s.io/cri-api v0.33.2 => k8s.io/cri-api v0.33.2 +# k8s.io/cri-api v0.33.4 => k8s.io/cri-api v0.33.4 ## explicit; go 1.24.0 k8s.io/cri-api/pkg/apis k8s.io/cri-api/pkg/apis/runtime/v1 -# k8s.io/cri-client v0.0.0 => k8s.io/cri-client v0.33.2 +# k8s.io/cri-client v0.0.0 => k8s.io/cri-client v0.33.4 ## explicit; go 1.24.0 k8s.io/cri-client/pkg k8s.io/cri-client/pkg/internal k8s.io/cri-client/pkg/logs k8s.io/cri-client/pkg/util -# k8s.io/csi-translation-lib v0.0.0 => k8s.io/csi-translation-lib v0.33.2 +# k8s.io/csi-translation-lib v0.0.0 => k8s.io/csi-translation-lib v0.33.4 ## explicit; go 1.24.0 k8s.io/csi-translation-lib k8s.io/csi-translation-lib/plugins -# k8s.io/dynamic-resource-allocation v0.0.0 => k8s.io/dynamic-resource-allocation v0.33.2 +# k8s.io/dynamic-resource-allocation v0.0.0 => k8s.io/dynamic-resource-allocation v0.33.4 ## explicit; go 1.24.0 k8s.io/dynamic-resource-allocation/api k8s.io/dynamic-resource-allocation/cel @@ -1497,15 +1497,15 @@ k8s.io/kube-openapi/pkg/validation/errors k8s.io/kube-openapi/pkg/validation/spec k8s.io/kube-openapi/pkg/validation/strfmt k8s.io/kube-openapi/pkg/validation/strfmt/bson -# k8s.io/kube-scheduler v0.0.0 => k8s.io/kube-scheduler v0.33.2 +# k8s.io/kube-scheduler v0.0.0 => k8s.io/kube-scheduler v0.33.4 ## explicit; go 1.24.0 k8s.io/kube-scheduler/config/v1 k8s.io/kube-scheduler/extender/v1 -# k8s.io/kubectl v0.31.1 => k8s.io/kubectl v0.33.2 +# k8s.io/kubectl v0.31.1 => k8s.io/kubectl v0.33.4 ## explicit; go 1.24.0 k8s.io/kubectl/pkg/scale k8s.io/kubectl/pkg/util/podutils -# k8s.io/kubelet v0.33.2 => k8s.io/kubelet v0.33.2 +# k8s.io/kubelet v0.33.4 => k8s.io/kubelet v0.33.4 ## explicit; go 1.24.0 k8s.io/kubelet/pkg/apis k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1 @@ -1515,7 +1515,7 @@ k8s.io/kubelet/pkg/apis/pluginregistration/v1 k8s.io/kubelet/pkg/apis/podresources/v1 k8s.io/kubelet/pkg/apis/podresources/v1alpha1 k8s.io/kubelet/pkg/apis/stats/v1alpha1 -# k8s.io/kubernetes v1.33.2 => k8s.io/kubernetes v1.33.2 +# k8s.io/kubernetes v1.33.4 => k8s.io/kubernetes v1.33.4 ## explicit; go 1.24.0 k8s.io/kubernetes/pkg/api/legacyscheme k8s.io/kubernetes/pkg/api/service @@ -1679,7 +1679,7 @@ k8s.io/kubernetes/third_party/forked/libcontainer/utils # k8s.io/mount-utils v0.33.4 ## explicit; go 1.24.0 k8s.io/mount-utils -# k8s.io/pod-security-admission v0.31.1 => k8s.io/pod-security-admission v0.33.2 +# k8s.io/pod-security-admission v0.31.1 => k8s.io/pod-security-admission v0.33.4 ## explicit; go 1.24.0 k8s.io/pod-security-admission/api k8s.io/pod-security-admission/policy @@ -1853,35 +1853,35 @@ sigs.k8s.io/structured-merge-diff/v4/value sigs.k8s.io/yaml sigs.k8s.io/yaml/goyaml.v2 # github.com/pmezard/go-difflib => github.com/pmezard/go-difflib v1.0.0 -# k8s.io/api => k8s.io/api v0.33.2 -# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.33.2 -# k8s.io/apimachinery => k8s.io/apimachinery v0.33.2 -# k8s.io/apiserver => k8s.io/apiserver v0.33.2 -# k8s.io/cli-runtime => k8s.io/cli-runtime v0.33.2 -# k8s.io/client-go => k8s.io/client-go v0.33.2 -# k8s.io/cloud-provider => k8s.io/cloud-provider v0.33.2 -# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.33.2 -# k8s.io/code-generator => k8s.io/code-generator v0.33.2 -# k8s.io/component-base => k8s.io/component-base v0.33.2 -# k8s.io/component-helpers => k8s.io/component-helpers v0.33.2 -# k8s.io/controller-manager => k8s.io/controller-manager v0.33.2 -# k8s.io/cri-api => k8s.io/cri-api v0.33.2 -# k8s.io/cri-client => k8s.io/cri-client v0.33.2 -# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.33.2 -# k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.33.2 -# k8s.io/endpointslice => k8s.io/endpointslice v0.33.2 -# k8s.io/externaljwt => k8s.io/externaljwt v0.33.2 -# k8s.io/kms => k8s.io/kms v0.33.2 -# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.33.2 -# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.33.2 -# k8s.io/kube-proxy => k8s.io/kube-proxy v0.33.2 -# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.33.2 -# k8s.io/kubectl => k8s.io/kubectl v0.33.2 -# k8s.io/kubelet => k8s.io/kubelet v0.33.2 -# k8s.io/kubernetes => k8s.io/kubernetes v1.33.2 -# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.33.2 -# k8s.io/metrics => k8s.io/metrics v0.33.2 -# k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.33.2 -# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.33.2 -# k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.33.2 -# k8s.io/sample-controller => k8s.io/sample-controller v0.33.2 +# k8s.io/api => k8s.io/api v0.33.4 +# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.33.4 +# k8s.io/apimachinery => k8s.io/apimachinery v0.33.4 +# k8s.io/apiserver => k8s.io/apiserver v0.33.4 +# k8s.io/cli-runtime => k8s.io/cli-runtime v0.33.4 +# k8s.io/client-go => k8s.io/client-go v0.33.4 +# k8s.io/cloud-provider => k8s.io/cloud-provider v0.33.4 +# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.33.4 +# k8s.io/code-generator => k8s.io/code-generator v0.33.4 +# k8s.io/component-base => k8s.io/component-base v0.33.4 +# k8s.io/component-helpers => k8s.io/component-helpers v0.33.4 +# k8s.io/controller-manager => k8s.io/controller-manager v0.33.4 +# k8s.io/cri-api => k8s.io/cri-api v0.33.4 +# k8s.io/cri-client => k8s.io/cri-client v0.33.4 +# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.33.4 +# k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.33.4 +# k8s.io/endpointslice => k8s.io/endpointslice v0.33.4 +# k8s.io/externaljwt => k8s.io/externaljwt v0.33.4 +# k8s.io/kms => k8s.io/kms v0.33.4 +# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.33.4 +# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.33.4 +# k8s.io/kube-proxy => k8s.io/kube-proxy v0.33.4 +# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.33.4 +# k8s.io/kubectl => k8s.io/kubectl v0.33.4 +# k8s.io/kubelet => k8s.io/kubelet v0.33.4 +# k8s.io/kubernetes => k8s.io/kubernetes v1.33.4 +# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.33.4 +# k8s.io/metrics => k8s.io/metrics v0.33.4 +# k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.33.4 +# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.33.4 +# k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.33.4 +# k8s.io/sample-controller => k8s.io/sample-controller v0.33.4