Skip to content

Commit 612fa6b

Browse files
twz123twz123
authored
Merge pull request #5447 from twz123/backport-5442-to-release-1.31
[Backport release-1.31] Bump Kubernetes to v1.31.5
2 parents 977919d + d6cd1bd commit 612fa6b

File tree

11 files changed

+110
-110
lines changed

11 files changed

+110
-110
lines changed

‎.github/workflows/publish-docs-manual.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
workflow_dispatch:
44
inputs:
55
version:
6-
description: 'Version tag (e.g."v1.31.3+k0s.0")'
6+
description: 'Version tag (e.g."v1.31.5+k0s.0")'
77
required: true
88

99
env:

‎embedded-bins/Makefile.variables

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ containerd_build_shim_go_cgo_enabled = 0
2222
#containerd_build_go_ldflags =
2323
containerd_build_go_ldflags_extra = "-w -s -extldflags=-static"
2424

25-
kubernetes_version = 1.31.3
25+
kubernetes_version = 1.31.5
2626
helm_version = 3.11.1
2727
kubernetes_buildimage = $(golang_buildimage)
2828
kubernetes_build_go_tags = "providerless"

‎go.mod

+49-49
Original file line numberDiff line numberDiff line change
@@ -63,20 +63,20 @@ require (
6363

6464
// Kubernetes
6565
require (
66-
k8s.io/api v0.31.3
67-
k8s.io/apiextensions-apiserver v0.31.3
68-
k8s.io/apimachinery v0.31.3
69-
k8s.io/cli-runtime v0.31.3
70-
k8s.io/client-go v0.31.3
71-
k8s.io/cloud-provider v0.31.3
72-
k8s.io/component-base v0.31.3
73-
k8s.io/component-helpers v0.31.3
74-
k8s.io/cri-api v0.31.3
75-
k8s.io/kube-aggregator v0.31.3
76-
k8s.io/kubectl v0.31.3
77-
k8s.io/kubelet v0.31.3
78-
k8s.io/kubernetes v1.31.3
79-
k8s.io/mount-utils v0.31.3
66+
k8s.io/api v0.31.5
67+
k8s.io/apiextensions-apiserver v0.31.5
68+
k8s.io/apimachinery v0.31.5
69+
k8s.io/cli-runtime v0.31.5
70+
k8s.io/client-go v0.31.5
71+
k8s.io/cloud-provider v0.31.5
72+
k8s.io/component-base v0.31.5
73+
k8s.io/component-helpers v0.31.5
74+
k8s.io/cri-api v0.31.5
75+
k8s.io/kube-aggregator v0.31.5
76+
k8s.io/kubectl v0.31.5
77+
k8s.io/kubelet v0.31.5
78+
k8s.io/kubernetes v1.31.5
79+
k8s.io/mount-utils v0.31.5
8080
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
8181
sigs.k8s.io/controller-runtime v0.19.0
8282
sigs.k8s.io/yaml v1.4.0
@@ -271,12 +271,12 @@ require (
271271
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
272272
gopkg.in/yaml.v2 v2.4.0 // indirect
273273
gopkg.in/yaml.v3 v3.0.1 // indirect
274-
k8s.io/apiserver v0.31.3 // indirect
275-
k8s.io/controller-manager v0.31.3 // indirect
274+
k8s.io/apiserver v0.31.5 // indirect
275+
k8s.io/controller-manager v0.31.5 // indirect
276276
k8s.io/klog/v2 v2.130.1 // indirect
277-
k8s.io/kms v0.31.3 // indirect
277+
k8s.io/kms v0.31.5 // indirect
278278
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
279-
k8s.io/metrics v0.31.3 // indirect
279+
k8s.io/metrics v0.31.5 // indirect
280280
oras.land/oras-go v1.2.5 // indirect
281281
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
282282
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
@@ -288,35 +288,35 @@ require (
288288

289289
// Replacements duplicated from upstream Kubernetes
290290
replace (
291-
// https://github.com/kubernetes/kubernetes/blob/v1.31.3/go.mod#L227-L258
292-
k8s.io/api => k8s.io/api v0.31.3
293-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.3
294-
k8s.io/apimachinery => k8s.io/apimachinery v0.31.3
295-
k8s.io/apiserver => k8s.io/apiserver v0.31.3
296-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.3
297-
k8s.io/client-go => k8s.io/client-go v0.31.3
298-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.3
299-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.3
300-
k8s.io/code-generator => k8s.io/code-generator v0.31.3
301-
k8s.io/component-base => k8s.io/component-base v0.31.3
302-
k8s.io/component-helpers => k8s.io/component-helpers v0.31.3
303-
k8s.io/controller-manager => k8s.io/controller-manager v0.31.3
304-
k8s.io/cri-api => k8s.io/cri-api v0.31.3
305-
k8s.io/cri-client => k8s.io/cri-client v0.31.3
306-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.3
307-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.3
308-
k8s.io/endpointslice => k8s.io/endpointslice v0.31.3
309-
k8s.io/kms => k8s.io/kms v0.31.3
310-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.3
311-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.3
312-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.3
313-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.3
314-
k8s.io/kubectl => k8s.io/kubectl v0.31.3
315-
k8s.io/kubelet => k8s.io/kubelet v0.31.3
316-
k8s.io/metrics => k8s.io/metrics v0.31.3
317-
k8s.io/mount-utils => k8s.io/mount-utils v0.31.3
318-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.3
319-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.3
320-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.3
321-
k8s.io/sample-controller => k8s.io/sample-controller v0.31.3
291+
// https://github.com/kubernetes/kubernetes/blob/v1.31.5/go.mod#L227-L258
292+
k8s.io/api => k8s.io/api v0.31.5
293+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.5
294+
k8s.io/apimachinery => k8s.io/apimachinery v0.31.5
295+
k8s.io/apiserver => k8s.io/apiserver v0.31.5
296+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.5
297+
k8s.io/client-go => k8s.io/client-go v0.31.5
298+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.5
299+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.5
300+
k8s.io/code-generator => k8s.io/code-generator v0.31.5
301+
k8s.io/component-base => k8s.io/component-base v0.31.5
302+
k8s.io/component-helpers => k8s.io/component-helpers v0.31.5
303+
k8s.io/controller-manager => k8s.io/controller-manager v0.31.5
304+
k8s.io/cri-api => k8s.io/cri-api v0.31.5
305+
k8s.io/cri-client => k8s.io/cri-client v0.31.5
306+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.5
307+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.5
308+
k8s.io/endpointslice => k8s.io/endpointslice v0.31.5
309+
k8s.io/kms => k8s.io/kms v0.31.5
310+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.5
311+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.5
312+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.5
313+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.5
314+
k8s.io/kubectl => k8s.io/kubectl v0.31.5
315+
k8s.io/kubelet => k8s.io/kubelet v0.31.5
316+
k8s.io/metrics => k8s.io/metrics v0.31.5
317+
k8s.io/mount-utils => k8s.io/mount-utils v0.31.5
318+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.5
319+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.5
320+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.5
321+
k8s.io/sample-controller => k8s.io/sample-controller v0.31.5
322322
)

‎go.sum

+36-36
Original file line numberDiff line numberDiff line change
@@ -838,46 +838,46 @@ helm.sh/helm/v3 v3.16.1 h1:cER6tI/8PgUAsaJaQCVBUg3VI9KN4oVaZJgY60RIc0c=
838838
helm.sh/helm/v3 v3.16.1/go.mod h1:r+xBHHP20qJeEqtvBXMf7W35QDJnzY/eiEBzt+TfHps=
839839
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
840840
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
841-
k8s.io/api v0.31.3 h1:umzm5o8lFbdN/hIXbrK9oRpOproJO62CV1zqxXrLgk8=
842-
k8s.io/api v0.31.3/go.mod h1:UJrkIp9pnMOI9K2nlL6vwpxRzzEX5sWgn8kGQe92kCE=
843-
k8s.io/apiextensions-apiserver v0.31.3 h1:+GFGj2qFiU7rGCsA5o+p/rul1OQIq6oYpQw4+u+nciE=
844-
k8s.io/apiextensions-apiserver v0.31.3/go.mod h1:2DSpFhUZZJmn/cr/RweH1cEVVbzFw9YBu4T+U3mf1e4=
845-
k8s.io/apimachinery v0.31.3 h1:6l0WhcYgasZ/wk9ktLq5vLaoXJJr5ts6lkaQzgeYPq4=
846-
k8s.io/apimachinery v0.31.3/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
847-
k8s.io/apiserver v0.31.3 h1:+1oHTtCB+OheqFEz375D0IlzHZ5VeQKX1KGXnx+TTuY=
848-
k8s.io/apiserver v0.31.3/go.mod h1:PrxVbebxrxQPFhJk4powDISIROkNMKHibTg9lTRQ0Qg=
849-
k8s.io/cli-runtime v0.31.3 h1:fEQD9Xokir78y7pVK/fCJN090/iYNrLHpFbGU4ul9TI=
850-
k8s.io/cli-runtime v0.31.3/go.mod h1:Q2jkyTpl+f6AtodQvgDI8io3jrfr+Z0LyQBPJJ2Btq8=
851-
k8s.io/client-go v0.31.3 h1:CAlZuM+PH2cm+86LOBemaJI/lQ5linJ6UFxKX/SoG+4=
852-
k8s.io/client-go v0.31.3/go.mod h1:2CgjPUTpv3fE5dNygAr2NcM8nhHzXvxB8KL5gYc3kJs=
853-
k8s.io/cloud-provider v0.31.3 h1:7C3CHQUUwnv/HWWVIaibZH06iPg663RYQ6C6Zy4FnO8=
854-
k8s.io/cloud-provider v0.31.3/go.mod h1:c7csKppoVb9Ej6upJ28AvHy4B3BtlRMzXfgezsDdPKw=
855-
k8s.io/component-base v0.31.3 h1:DMCXXVx546Rfvhj+3cOm2EUxhS+EyztH423j+8sOwhQ=
856-
k8s.io/component-base v0.31.3/go.mod h1:xME6BHfUOafRgT0rGVBGl7TuSg8Z9/deT7qq6w7qjIU=
857-
k8s.io/component-helpers v0.31.3 h1:0zGPD2PrekhFWgmz85XxlMEl7dfhlKC1tERZDe3onQc=
858-
k8s.io/component-helpers v0.31.3/go.mod h1:HZ1HZx2TKXM7xSUV2cR9L5yDoyZPhhHQNaE3BPBLPUQ=
859-
k8s.io/controller-manager v0.31.3 h1:TyUav69iNYwLGwA96JDhusoZoGRdh1sdrLjXmWTcPgs=
860-
k8s.io/controller-manager v0.31.3/go.mod h1:yuhec+dbXmBz+4c32kxJxmcauB+1pjO2ttfYODWuv18=
861-
k8s.io/cri-api v0.31.3 h1:dsZXzrGrCEwHjsTDlAV7rutEplpMLY8bfNRMIqrtXjo=
862-
k8s.io/cri-api v0.31.3/go.mod h1:Po3TMAYH/+KrZabi7QiwQI4a692oZcUOUThd/rqwxrI=
841+
k8s.io/api v0.31.5 h1:7jP74egbPUOCLJV5KheUnwo9gz3zzUsMIj2EPkuYK1E=
842+
k8s.io/api v0.31.5/go.mod h1:RMyMdZG1kJjou2ng5buEti0OHlo0uFXgSzTZ/k5LeVk=
843+
k8s.io/apiextensions-apiserver v0.31.5 h1:50+b/hHx4nyvQ+gaFH7p5myPEZyekGhGGAQb4vnBUlQ=
844+
k8s.io/apiextensions-apiserver v0.31.5/go.mod h1:6vZ7IIlk3l7GSFcbaNz5CEYpUBLsQ0ee+LgLGOsExWQ=
845+
k8s.io/apimachinery v0.31.5 h1:NxhAVGcfrSdTMx3M2v1OnvcMS7h1ZnWyt2x2z8CJJBU=
846+
k8s.io/apimachinery v0.31.5/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
847+
k8s.io/apiserver v0.31.5 h1:n0daI1zIb+G2Jkzqjm2NQJSJfTKccgFeHHQM4LYsz7E=
848+
k8s.io/apiserver v0.31.5/go.mod h1:SboTZ2NHCsXjAHqTrE/kDTnrzquVY5mDKNnoCdRFLJw=
849+
k8s.io/cli-runtime v0.31.5 h1:d8Q1CW6u8DWlU+wZgs7gQXeEl5J9rAHU4uDUz2uFtFY=
850+
k8s.io/cli-runtime v0.31.5/go.mod h1:8zdTB5+NadarkrlOLzboMNxBjrTs6O2alRIokk9mzEY=
851+
k8s.io/client-go v0.31.5 h1:rmDswcUaIFAJ5vJaB82pjyqc52DgHCPv0G6af3OupO0=
852+
k8s.io/client-go v0.31.5/go.mod h1:js93IlRSzRHql9o9zP54N56rMR249uH4+srnSOcFLsU=
853+
k8s.io/cloud-provider v0.31.5 h1:2uzN7bO1KjKLFr3BvjVZfgVIR0Cxc4m10RKP65FwGUs=
854+
k8s.io/cloud-provider v0.31.5/go.mod h1:TNZnihtjhQzENg9HtIzEpKHAQs0U73XHRW+BAoxzIS0=
855+
k8s.io/component-base v0.31.5 h1:kpFiy1hI7F4Owp+o59H2CVLzmN94qwcPz+2L6wRhkqM=
856+
k8s.io/component-base v0.31.5/go.mod h1:OiiusrmcLz42i9VvcAd94yQIN7UzQHJxN/hXxwYzj6E=
857+
k8s.io/component-helpers v0.31.5 h1:4CGg9/+RLbeM2r5nPyoyocsAteXRGHs4yv23yBdw7KE=
858+
k8s.io/component-helpers v0.31.5/go.mod h1:E2i3XIrLFiGUdTOTrJvKPlDs9eVja4vm+N4nDk6XTRw=
859+
k8s.io/controller-manager v0.31.5 h1:FBlp/1k4puNIjIFsz5gexN4X+FbsMW/dHN8Cxjzowjs=
860+
k8s.io/controller-manager v0.31.5/go.mod h1:6O7StIoLuQUbOC0gwaKfiu96FquTLhxsbEP7jlkOWy0=
861+
k8s.io/cri-api v0.31.5 h1:VWedOGJyzaxOsMtwsCkSGP0DcJOrGGTqcAEdCoKmlxw=
862+
k8s.io/cri-api v0.31.5/go.mod h1:Po3TMAYH/+KrZabi7QiwQI4a692oZcUOUThd/rqwxrI=
863863
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
864864
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
865-
k8s.io/kms v0.31.3 h1:XCFmiJn5CCKs8xoOLpCmu42Ubm/KW85wNHybGFcSAYc=
866-
k8s.io/kms v0.31.3/go.mod h1:OZKwl1fan3n3N5FFxnW5C4V3ygrah/3YXeJWS3O6+94=
867-
k8s.io/kube-aggregator v0.31.3 h1:DqHPdTglJHgOfB884AaroyxrML/aL82ASYOh65m7MSk=
868-
k8s.io/kube-aggregator v0.31.3/go.mod h1:Kx59Xjnf0SnY47qf9Or++4y3XCHQ3kR0xk1Di6KFiFU=
865+
k8s.io/kms v0.31.5 h1:KqAHTnJDSoTt8ZSLsalz6gmwlX0lzVWAVSYcqEj6Lqw=
866+
k8s.io/kms v0.31.5/go.mod h1:OZKwl1fan3n3N5FFxnW5C4V3ygrah/3YXeJWS3O6+94=
867+
k8s.io/kube-aggregator v0.31.5 h1:ibCqykJwv7Ht4tgwd1793N6h444gf5m7ZH2dpJ0r4yI=
868+
k8s.io/kube-aggregator v0.31.5/go.mod h1:bWajrGqcljoq5w1zWwj1qU34VoKfZeMZSCbK/vp127s=
869869
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
870870
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
871-
k8s.io/kubectl v0.31.3 h1:3r111pCjPsvnR98oLLxDMwAeM6OPGmPty6gSKaLTQes=
872-
k8s.io/kubectl v0.31.3/go.mod h1:lhMECDCbJN8He12qcKqs2QfmVo9Pue30geovBVpH5fs=
873-
k8s.io/kubelet v0.31.3 h1:DIXRAmvVGp42mV2vpA1GCLU6oO8who0/vp3Oq6kSpbI=
874-
k8s.io/kubelet v0.31.3/go.mod h1:KSdbEfNy5VzqUlAHlytA/fH12s+sE1u8fb/8JY9sL/8=
875-
k8s.io/kubernetes v1.31.3 h1:oqb7HdfnTelrGlZ6ziNugvQ/L/aJWR704114EAhUn9Q=
876-
k8s.io/kubernetes v1.31.3/go.mod h1:9xmT2buyTYj8TRKwRae7FcuY8k5+xlxv7VivvO0KKfs=
877-
k8s.io/metrics v0.31.3 h1:DkT9I3gFlb2/z+/4BMY7WrQ/PnbukuV4Yli82v/KBCM=
878-
k8s.io/metrics v0.31.3/go.mod h1:2w9gpd8z+13oJmaPR6p3kDyrDqnxSyoKpnOw2qLIdhI=
879-
k8s.io/mount-utils v0.31.3 h1:CANy3prUYvvDCc2X7ZKgpjpDhAidx4gjGh/WwDrCPq8=
880-
k8s.io/mount-utils v0.31.3/go.mod h1:HV/VYBUGqYUj4vt82YltzpWvgv8FPg0G9ItyInT3NPU=
871+
k8s.io/kubectl v0.31.5 h1:WRA5WA3rwxflKeO0PsjMpP3ZicNsv7fD8YEmA9+Rbck=
872+
k8s.io/kubectl v0.31.5/go.mod h1:WeEyd2KzUme3Laf7+5dM3aiDMRffeX8U90So1I6HkS0=
873+
k8s.io/kubelet v0.31.5 h1:AnGDd4NV1PybzffhosECiJe5dWxZJ/f6S4gtuZuHzIA=
874+
k8s.io/kubelet v0.31.5/go.mod h1:tILiNKFnjjWUg/SGIclQ6GA8ZWN653wATqIrzParnjs=
875+
k8s.io/kubernetes v1.31.5 h1:hIW8YLP1MtsAIyot6U0uPqTois0ESjUrvPK6hElUUEk=
876+
k8s.io/kubernetes v1.31.5/go.mod h1:9xmT2buyTYj8TRKwRae7FcuY8k5+xlxv7VivvO0KKfs=
877+
k8s.io/metrics v0.31.5 h1:0QQQ20yA3IdXyXC0CXLveRwOXF0ekCuPf6iNKVqXIbw=
878+
k8s.io/metrics v0.31.5/go.mod h1:wAMENPwG+OFEYRy6CHgjOXqWOfv4yzwQzGr7jPWU/WE=
879+
k8s.io/mount-utils v0.31.5 h1:WrY+6v6PlAkOeBVXEBrLhAvx9YnlAk8JorMCSowEMtI=
880+
k8s.io/mount-utils v0.31.5/go.mod h1:HV/VYBUGqYUj4vt82YltzpWvgv8FPg0G9ItyInT3NPU=
881881
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
882882
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
883883
oras.land/oras-go v1.2.5 h1:XpYuAwAb0DfQsunIyMfeET92emK8km3W4yEzZvUbsTo=

‎hack/tool/go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module tool
22

3-
go 1.22.0
3+
go 1.23
44

55
require (
66
github.com/hashicorp/terraform-exec v0.21.0
@@ -89,8 +89,8 @@ require (
8989
golang.org/x/time v0.5.0 // indirect
9090
gopkg.in/inf.v0 v0.9.1 // indirect
9191
gopkg.in/yaml.v2 v2.4.0 // indirect
92-
k8s.io/apimachinery v0.31.3 // indirect
93-
k8s.io/client-go v0.31.3 // indirect
92+
k8s.io/apimachinery v0.31.5 // indirect
93+
k8s.io/client-go v0.31.5 // indirect
9494
k8s.io/klog/v2 v2.130.1 // indirect
9595
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
9696
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect

‎hack/tool/go.sum

+6-6
Original file line numberDiff line numberDiff line change
@@ -331,12 +331,12 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
331331
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
332332
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
333333
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
334-
k8s.io/api v0.31.3 h1:umzm5o8lFbdN/hIXbrK9oRpOproJO62CV1zqxXrLgk8=
335-
k8s.io/api v0.31.3/go.mod h1:UJrkIp9pnMOI9K2nlL6vwpxRzzEX5sWgn8kGQe92kCE=
336-
k8s.io/apimachinery v0.31.3 h1:6l0WhcYgasZ/wk9ktLq5vLaoXJJr5ts6lkaQzgeYPq4=
337-
k8s.io/apimachinery v0.31.3/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
338-
k8s.io/client-go v0.31.3 h1:CAlZuM+PH2cm+86LOBemaJI/lQ5linJ6UFxKX/SoG+4=
339-
k8s.io/client-go v0.31.3/go.mod h1:2CgjPUTpv3fE5dNygAr2NcM8nhHzXvxB8KL5gYc3kJs=
334+
k8s.io/api v0.31.5 h1:7jP74egbPUOCLJV5KheUnwo9gz3zzUsMIj2EPkuYK1E=
335+
k8s.io/api v0.31.5/go.mod h1:RMyMdZG1kJjou2ng5buEti0OHlo0uFXgSzTZ/k5LeVk=
336+
k8s.io/apimachinery v0.31.5 h1:NxhAVGcfrSdTMx3M2v1OnvcMS7h1ZnWyt2x2z8CJJBU=
337+
k8s.io/apimachinery v0.31.5/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
338+
k8s.io/client-go v0.31.5 h1:rmDswcUaIFAJ5vJaB82pjyqc52DgHCPv0G6af3OupO0=
339+
k8s.io/client-go v0.31.5/go.mod h1:js93IlRSzRHql9o9zP54N56rMR249uH4+srnSOcFLsU=
340340
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
341341
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
342342
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=

‎inttest/sonobuoy/README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ spec:
6161
user: "ubuntu"
6262
uploadBinary: true
6363
k0s:
64-
version: "1.31.3+k0s.0"
64+
version: "1.31.5+k0s.0"
6565
```
6666
6767
To deploy a k0s cluster on the AWS machine, run:
@@ -98,9 +98,9 @@ INFO ==> Running phase: Gather host facts
9898
.
9999
.
100100
.
101-
INFO [ssh] 3.250.52.147:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.31.3+k0s.0
102-
INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.31.3+k0s.0
103-
INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.31.3+k0s.0
101+
INFO [ssh] 3.250.52.147:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.31.5+k0s.0
102+
INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.31.5+k0s.0
103+
INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.31.5+k0s.0
104104
INFO ==> Running phase: Configure k0s
105105
WARN [ssh] 63.32.21.232:22: generating default configuration
106106
INFO [ssh] 63.32.21.232:22: validating configuration
@@ -124,7 +124,7 @@ INFO [ssh] 3.250.52.147:22: waiting for node to become ready
124124
INFO ==> Running phase: Release exclusive host lock
125125
INFO ==> Running phase: Disconnect from hosts
126126
INFO ==> Finished in 1m42s
127-
INFO k0s cluster version v1.31.3+k0s.0 is now installed
127+
INFO k0s cluster version v1.31.5+k0s.0 is now installed
128128
INFO Tip: To access the cluster you can now fetch the admin kubeconfig using:
129129
INFO k0sctl kubeconfig
130130
```
@@ -152,7 +152,7 @@ Example Output:
152152
/home/ubuntu/k0s/inttest/bin/sonobuoy run --wait=1200 \
153153
--mode=certified-conformance \
154154
--plugin-env=e2e.E2E_EXTRA_ARGS="--ginkgo.v" \
155-
--kubernetes-version=v1.31.3
155+
--kubernetes-version=v1.31.5
156156
INFO[0000] create request issued name=sonobuoy namespace= resource=namespaces
157157
INFO[0000] create request issued name=sonobuoy-serviceaccount namespace=sonobuoy resource=serviceaccounts
158158
INFO[0000] create request issued name=sonobuoy-serviceaccount-sonobuoy namespace= resource=clusterrolebindings

‎inttest/update-server/html/unstable/index.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: unstable
2-
version: v1.31.3+k0s.0
2+
version: v1.31.5+k0s.0
33
downloadURLs:
44
k0s:
55
linux-amd64: ..../k0s-amd64

‎pkg/apis/k0s/v1beta1/kubeproxy.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ type KubeProxy struct {
4949
}
5050

5151
// KubeProxyIPTablesConfiguration contains iptables-related kube-proxy configuration
52-
// @see https://github.com/kubernetes/kube-proxy/blob/v0.31.3/config/v1alpha1/types.go#L27-L48
52+
// @see https://github.com/kubernetes/kube-proxy/blob/v0.31.5/config/v1alpha1/types.go#L27-L48
5353
type KubeProxyIPTablesConfiguration struct {
5454
MasqueradeBit *int32 `json:"masqueradeBit,omitempty"`
5555
MasqueradeAll bool `json:"masqueradeAll,omitempty"`
@@ -59,7 +59,7 @@ type KubeProxyIPTablesConfiguration struct {
5959
}
6060

6161
// KubeProxyIPVSConfiguration contains ipvs-related kube-proxy configuration
62-
// @see https://github.com/kubernetes/kube-proxy/blob/v0.31.3/config/v1alpha1/types.go#L52-L78
62+
// @see https://github.com/kubernetes/kube-proxy/blob/v0.31.5/config/v1alpha1/types.go#L52-L78
6363
type KubeProxyIPVSConfiguration struct {
6464
SyncPeriod metav1.Duration `json:"syncPeriod,omitempty"`
6565
MinSyncPeriod metav1.Duration `json:"minSyncPeriod,omitempty"`
@@ -72,7 +72,7 @@ type KubeProxyIPVSConfiguration struct {
7272
}
7373

7474
// KubeProxyNFTablesConfiguration contains nftables-related kube-proxy configuration
75-
// @see https://github.com/kubernetes/kube-proxy/blob/v0.31.3/config/v1alpha1/types.go#L82-L97
75+
// @see https://github.com/kubernetes/kube-proxy/blob/v0.31.5/config/v1alpha1/types.go#L82-L97
7676
type KubeProxyNFTablesConfiguration struct {
7777
SyncPeriod metav1.Duration `json:"syncPeriod,omitempty"`
7878
MasqueradeBit *int32 `json:"masqueradeBit,omitempty"`

‎pkg/constant/constant.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ const (
8686
KubePauseContainerImage = "registry.k8s.io/pause"
8787
KubePauseContainerImageVersion = "3.9"
8888
KubeProxyImage = "quay.io/k0sproject/kube-proxy"
89-
KubeProxyImageVersion = "v1.31.3"
89+
KubeProxyImageVersion = "v1.31.5"
9090
CoreDNSImage = "quay.io/k0sproject/coredns"
9191
CoreDNSImageVersion = "1.11.4"
9292
EnvoyProxyImage = "quay.io/k0sproject/envoy-distroless"

0 commit comments

Comments
 (0)