Skip to content

Commit 219bb8a

Browse files
juanluisvaladasjuanluisvaladas
committed
Bump kuberetes to 1.31.7
https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.31.md#changelog-since-v1316 Bump golang to 1.23.7 because since 1.31.7 it's built with go 1.23 Signed-off-by: Juan-Luis de Sousa-Valadas Castaño <[email protected]>
1 parent e7eedf0 commit 219bb8a

File tree

11 files changed

+110
-111
lines changed

11 files changed

+110
-111
lines changed

‎embedded-bins/Makefile.variables

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
alpine_version = 3.20
22
alpine_patch_version = $(alpine_version).6
33
golang_buildimage=docker.io/library/golang:$(go_version)-alpine$(alpine_version)
4-
go_version = 1.22.12
4+
go_version = 1.23.7
55

66
runc_version = 1.1.15
77
runc_buildimage = $(golang_buildimage)
@@ -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.6
25+
kubernetes_version = 1.31.7
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.6
67-
k8s.io/apiextensions-apiserver v0.31.6
68-
k8s.io/apimachinery v0.31.6
69-
k8s.io/cli-runtime v0.31.6
70-
k8s.io/client-go v0.31.6
71-
k8s.io/cloud-provider v0.31.6
72-
k8s.io/component-base v0.31.6
73-
k8s.io/component-helpers v0.31.6
74-
k8s.io/cri-api v0.31.6
75-
k8s.io/kube-aggregator v0.31.6
76-
k8s.io/kubectl v0.31.6
77-
k8s.io/kubelet v0.31.6
78-
k8s.io/kubernetes v1.31.6
79-
k8s.io/mount-utils v0.31.6
66+
k8s.io/api v0.31.7
67+
k8s.io/apiextensions-apiserver v0.31.7
68+
k8s.io/apimachinery v0.31.7
69+
k8s.io/cli-runtime v0.31.7
70+
k8s.io/client-go v0.31.7
71+
k8s.io/cloud-provider v0.31.7
72+
k8s.io/component-base v0.31.7
73+
k8s.io/component-helpers v0.31.7
74+
k8s.io/cri-api v0.31.7
75+
k8s.io/kube-aggregator v0.31.7
76+
k8s.io/kubectl v0.31.7
77+
k8s.io/kubelet v0.31.7
78+
k8s.io/kubernetes v1.31.7
79+
k8s.io/mount-utils v0.31.7
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.6 // indirect
275-
k8s.io/controller-manager v0.31.6 // indirect
274+
k8s.io/apiserver v0.31.7 // indirect
275+
k8s.io/controller-manager v0.31.7 // indirect
276276
k8s.io/klog/v2 v2.130.1 // indirect
277-
k8s.io/kms v0.31.6 // indirect
277+
k8s.io/kms v0.31.7 // indirect
278278
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
279-
k8s.io/metrics v0.31.6 // indirect
279+
k8s.io/metrics v0.31.7 // 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.6/go.mod#L227-L258
292-
k8s.io/api => k8s.io/api v0.31.6
293-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.6
294-
k8s.io/apimachinery => k8s.io/apimachinery v0.31.6
295-
k8s.io/apiserver => k8s.io/apiserver v0.31.6
296-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.6
297-
k8s.io/client-go => k8s.io/client-go v0.31.6
298-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.6
299-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.6
300-
k8s.io/code-generator => k8s.io/code-generator v0.31.6
301-
k8s.io/component-base => k8s.io/component-base v0.31.6
302-
k8s.io/component-helpers => k8s.io/component-helpers v0.31.6
303-
k8s.io/controller-manager => k8s.io/controller-manager v0.31.6
304-
k8s.io/cri-api => k8s.io/cri-api v0.31.6
305-
k8s.io/cri-client => k8s.io/cri-client v0.31.6
306-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.6
307-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.6
308-
k8s.io/endpointslice => k8s.io/endpointslice v0.31.6
309-
k8s.io/kms => k8s.io/kms v0.31.6
310-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.6
311-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.6
312-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.6
313-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.6
314-
k8s.io/kubectl => k8s.io/kubectl v0.31.6
315-
k8s.io/kubelet => k8s.io/kubelet v0.31.6
316-
k8s.io/metrics => k8s.io/metrics v0.31.6
317-
k8s.io/mount-utils => k8s.io/mount-utils v0.31.6
318-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.6
319-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.6
320-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.6
321-
k8s.io/sample-controller => k8s.io/sample-controller v0.31.6
291+
// https://github.com/kubernetes/kubernetes/blob/v1.31.7/go.mod#L227-L258
292+
k8s.io/api => k8s.io/api v0.31.7
293+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.7
294+
k8s.io/apimachinery => k8s.io/apimachinery v0.31.7
295+
k8s.io/apiserver => k8s.io/apiserver v0.31.7
296+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.7
297+
k8s.io/client-go => k8s.io/client-go v0.31.7
298+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.7
299+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.7
300+
k8s.io/code-generator => k8s.io/code-generator v0.31.7
301+
k8s.io/component-base => k8s.io/component-base v0.31.7
302+
k8s.io/component-helpers => k8s.io/component-helpers v0.31.7
303+
k8s.io/controller-manager => k8s.io/controller-manager v0.31.7
304+
k8s.io/cri-api => k8s.io/cri-api v0.31.7
305+
k8s.io/cri-client => k8s.io/cri-client v0.31.7
306+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.7
307+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.7
308+
k8s.io/endpointslice => k8s.io/endpointslice v0.31.7
309+
k8s.io/kms => k8s.io/kms v0.31.7
310+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.7
311+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.7
312+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.7
313+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.7
314+
k8s.io/kubectl => k8s.io/kubectl v0.31.7
315+
k8s.io/kubelet => k8s.io/kubelet v0.31.7
316+
k8s.io/metrics => k8s.io/metrics v0.31.7
317+
k8s.io/mount-utils => k8s.io/mount-utils v0.31.7
318+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.7
319+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.7
320+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.7
321+
k8s.io/sample-controller => k8s.io/sample-controller v0.31.7
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.6 h1:ocWG/UhC9Mqp5oEfYWy9wCddbZiZyBAFTlBt0LVlhDg=
842-
k8s.io/api v0.31.6/go.mod h1:i16xSiKMgVIVhsJMxfWq0mJbXA+Z7KhjPgYmwT41hl4=
843-
k8s.io/apiextensions-apiserver v0.31.6 h1:v9sqyWlrgFZpAPdEb/bEiXfM98TfSppwRF0X/uWKXh0=
844-
k8s.io/apiextensions-apiserver v0.31.6/go.mod h1:QVH3CFwqzGZtwsxPYzJlA/Qiwgb5FXmRMGls3CjzvbI=
845-
k8s.io/apimachinery v0.31.6 h1:Pn96A0wHD0X8+l7QTdAzdLQPrpav1s8rU6A+v2/9UEY=
846-
k8s.io/apimachinery v0.31.6/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
847-
k8s.io/apiserver v0.31.6 h1:FEhEGLsz1PbMOHeQZDbOUlMh36zRZbjgKwJCoMhdGmw=
848-
k8s.io/apiserver v0.31.6/go.mod h1:dpFh+xqFQ02O8vLYCIqoiV7sJIpZsUULeNuag6Y9HGo=
849-
k8s.io/cli-runtime v0.31.6 h1:Ki+WKjczcP6m0C6DuWlmkavTKiDxGDXivPqRUK2MfrY=
850-
k8s.io/cli-runtime v0.31.6/go.mod h1:ubUsw37s/wJUqQ6p88OIBlLJZxVWnq5Ny2tDNxPtwCs=
851-
k8s.io/client-go v0.31.6 h1:51HT40qVIZ13BrHKeWxFuU52uoPnFhxTYJnv4+LTgp4=
852-
k8s.io/client-go v0.31.6/go.mod h1:MEq7JQJelUQ0/4fMoPEUrc/OOFyGo/9LmGA38H6O6xY=
853-
k8s.io/cloud-provider v0.31.6 h1:5vVMyf/m/n8ij/GmSJLRcatchmciRr0gs4peBcxqvKk=
854-
k8s.io/cloud-provider v0.31.6/go.mod h1:iT6kIEMEXrTIvRBAaRU5qefRzgPaSV6kwTc6mjhhnEw=
855-
k8s.io/component-base v0.31.6 h1:FgI25PuZtCp2n7AFpOaDpMQOLieFdrpAbpeoZu7VhDI=
856-
k8s.io/component-base v0.31.6/go.mod h1:aVRrh8lAI1kSShFmwcKLhc3msQoUcmFWPBDf0sXaISM=
857-
k8s.io/component-helpers v0.31.6 h1:Af8BcE6pElKlLaerwW9s04jTQVFa66wmI1pkaNfDWzE=
858-
k8s.io/component-helpers v0.31.6/go.mod h1:6CRV6M+7R13eqtz4FBm2ty9eH+QajDcP3y0Bklzh2FA=
859-
k8s.io/controller-manager v0.31.6 h1:HQRUV6nogHo2N7vr3cgVNjZ+wvHIMvxEMjTeCrHitE4=
860-
k8s.io/controller-manager v0.31.6/go.mod h1:0HDNTZVapQFa9G96jNxrU99ht7fQJVEKBXDzqKDMez0=
861-
k8s.io/cri-api v0.31.6 h1:TdO+8b/CL88jXQ/OEKql6Pt6y0lyyC9+xvGGXUsuEW4=
862-
k8s.io/cri-api v0.31.6/go.mod h1:Po3TMAYH/+KrZabi7QiwQI4a692oZcUOUThd/rqwxrI=
841+
k8s.io/api v0.31.7 h1:wSo59nXpVXmaB6hgNVJCrdnKtyYoutIgpNNBbROBd2U=
842+
k8s.io/api v0.31.7/go.mod h1:vLUha4nXRUGtQdayzsmjur0lQApK/sJSxyR/fwuujcU=
843+
k8s.io/apiextensions-apiserver v0.31.7 h1:FujQQl6iKuCF5nX4GIQy3ClvftU8MqadAyi9oQ6ZeAw=
844+
k8s.io/apiextensions-apiserver v0.31.7/go.mod h1:YmNzYECWFYy8n9R0oxtVAD9JYILZnZCNziYrpUQhKeI=
845+
k8s.io/apimachinery v0.31.7 h1:fpV8yLerIZFAkj0of66+i1ArPv/Btf9KO6Aulng7RRw=
846+
k8s.io/apimachinery v0.31.7/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
847+
k8s.io/apiserver v0.31.7 h1:L1JQgfdQfvSZNBhXJljv9ekc/JirAZAmR3B2Np5mSKk=
848+
k8s.io/apiserver v0.31.7/go.mod h1:IAHYtQWod93amFVHuFlPJAZkYF+aC5qblgDNsSvP9mQ=
849+
k8s.io/cli-runtime v0.31.7 h1:k8IkChvyUkemf7ssvgLKtq5JJH6sXZet4c3iyY0Tn74=
850+
k8s.io/cli-runtime v0.31.7/go.mod h1:4QmnnX+OB8L8IT5qdWTfrT9NlCcqvxLkFn3lNzO8N84=
851+
k8s.io/client-go v0.31.7 h1:2+LFJc6Xw6rhmpDbN1NSmhoFLWBh62cPG/P+IfaTSGY=
852+
k8s.io/client-go v0.31.7/go.mod h1:hrrMorBQ17LqzoKIxKg5cSWvmWl94EwA/MUF0Mkf+Zw=
853+
k8s.io/cloud-provider v0.31.7 h1:kg+bkemVEjCI4J+SxHFrOcZznDcPkRTwzAHrUe/FZSw=
854+
k8s.io/cloud-provider v0.31.7/go.mod h1:nz9vAQrcHnIuwgX1xB7Btqkg37huHbhGBly+Ujq2kWU=
855+
k8s.io/component-base v0.31.7 h1:HLGy3757F1xfidwYzrsrL6gqAML4jKiT1rfNTRv1vhw=
856+
k8s.io/component-base v0.31.7/go.mod h1:OzaImRFsLuWLA/KyahAjR/pmG0dhxciGB9Rb1vTgdJ0=
857+
k8s.io/component-helpers v0.31.7 h1:THCAAOYffVxAOkeUMW0U86BmxRGXXAXMvlvObUEtMuQ=
858+
k8s.io/component-helpers v0.31.7/go.mod h1:bAjwoXfsMOP7BpRRV/6J2AVkc3tkb7MOlZtof4t7Lm4=
859+
k8s.io/controller-manager v0.31.7 h1:632MEG+zfUcHgOHakggD5EtNLA7cIaBI/gAuUUDk03A=
860+
k8s.io/controller-manager v0.31.7/go.mod h1:mAFSG10Z0R9eZttpFe8ambSUQEYYg42Thtber2O7bUs=
861+
k8s.io/cri-api v0.31.7 h1:wNW+bnW/rwvrmzLTEqu6Ubz8T4sKhh+J6f7K2Glt8qI=
862+
k8s.io/cri-api v0.31.7/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.6 h1:p7OY+9Hp8nPtgzm0vT9TrERNigQQSu8tkgWqn+GvB2w=
866-
k8s.io/kms v0.31.6/go.mod h1:OZKwl1fan3n3N5FFxnW5C4V3ygrah/3YXeJWS3O6+94=
867-
k8s.io/kube-aggregator v0.31.6 h1:aIS05FNszj8jdq2CQKVFad2hL6T43DR3Rppdz2aGb0k=
868-
k8s.io/kube-aggregator v0.31.6/go.mod h1:indx3RHm/cTT6xy9zUrD0UxR/aaPwS7PUxD+PgqzaBM=
865+
k8s.io/kms v0.31.7 h1:HSlveij+SIcCcDKugh/lFrnaooVgTIX5G6ircyK+e3Q=
866+
k8s.io/kms v0.31.7/go.mod h1:OZKwl1fan3n3N5FFxnW5C4V3ygrah/3YXeJWS3O6+94=
867+
k8s.io/kube-aggregator v0.31.7 h1:pRiMQ2M1dAGJqwXPeldwd4zes5SlMGQ6TF6y45lROco=
868+
k8s.io/kube-aggregator v0.31.7/go.mod h1:H8FjeBnKLiWksKEfaQ3AiVzbLmkRPApL5TWaZtcEppU=
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.6 h1:ngzql/UugqpEbeeyQX678BlVHXks19JR3CFjwKnWuFI=
872-
k8s.io/kubectl v0.31.6/go.mod h1:m6OXbx9s0sZiaZrfHHSEmJUD5CjWPA5+cVg0GZnVdzM=
873-
k8s.io/kubelet v0.31.6 h1:lxVvyLNDcb/QTpQNkDySk3iscgq4zubeSZs3cF6PmaA=
874-
k8s.io/kubelet v0.31.6/go.mod h1:BPghO52ilF7UzFEVBmYFOxdVtLge0P1gixjz84lBzzc=
875-
k8s.io/kubernetes v1.31.6 h1:zVhgWDFHmIj51o5sNARmjdgNvpq4K2Smya8pS5vxqlc=
876-
k8s.io/kubernetes v1.31.6/go.mod h1:9xmT2buyTYj8TRKwRae7FcuY8k5+xlxv7VivvO0KKfs=
877-
k8s.io/metrics v0.31.6 h1:rVtPvDrUs/5ZSV3ResrAManRWZx/jOZLmfH/7jZR6Yo=
878-
k8s.io/metrics v0.31.6/go.mod h1:nFpwlL5EpRcEWCcaztlHHC5NF8BTM4CswjTRtW0FnbE=
879-
k8s.io/mount-utils v0.31.6 h1:MYRoh63q/fFjSiwPNpDv8H9L1cJDVrSNYzXzNUKANZY=
880-
k8s.io/mount-utils v0.31.6/go.mod h1:HV/VYBUGqYUj4vt82YltzpWvgv8FPg0G9ItyInT3NPU=
871+
k8s.io/kubectl v0.31.7 h1:zFJlTxSd+o/TlvcquAZGT3z01ifAvVfuFtxBeRe7euE=
872+
k8s.io/kubectl v0.31.7/go.mod h1:mD2vgBEXN4AbSKb0V2NXN2pGiNu3IzKsRo9NRgCKUJ0=
873+
k8s.io/kubelet v0.31.7 h1:jGfsRU536pAyXq/hW9P7+a5k200j2BxBX8IjIWasmxY=
874+
k8s.io/kubelet v0.31.7/go.mod h1:JQM78Be3eV5cjk/KXCLuMuZyOWImYRslzw2EalOADMs=
875+
k8s.io/kubernetes v1.31.7 h1:3uCu7kNQxNBVbbqqe0pPjbW+h8L9aT01rD0bg+NdS5I=
876+
k8s.io/kubernetes v1.31.7/go.mod h1:9xmT2buyTYj8TRKwRae7FcuY8k5+xlxv7VivvO0KKfs=
877+
k8s.io/metrics v0.31.7 h1:L+RTDAnq5jwpFy9VmMC2a4fa+tTZZWCwvP2SDXkJ7II=
878+
k8s.io/metrics v0.31.7/go.mod h1:vPcE4osxbIilgwaiAiXCFeYruTbLIxNQVOp1vCsSQ4k=
879+
k8s.io/mount-utils v0.31.7 h1:wCqAZT3/pQ5OjKuXFOuLxJQYldhVY4+O5/8+L9deJ6w=
880+
k8s.io/mount-utils v0.31.7/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

+2-2
Original file line numberDiff line numberDiff line change
@@ -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.5 // indirect
93-
k8s.io/client-go v0.31.5 // indirect
92+
k8s.io/apimachinery v0.31.7 // indirect
93+
k8s.io/client-go v0.31.7 // 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.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=
334+
k8s.io/api v0.31.7 h1:wSo59nXpVXmaB6hgNVJCrdnKtyYoutIgpNNBbROBd2U=
335+
k8s.io/api v0.31.7/go.mod h1:vLUha4nXRUGtQdayzsmjur0lQApK/sJSxyR/fwuujcU=
336+
k8s.io/apimachinery v0.31.7 h1:fpV8yLerIZFAkj0of66+i1ArPv/Btf9KO6Aulng7RRw=
337+
k8s.io/apimachinery v0.31.7/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
338+
k8s.io/client-go v0.31.7 h1:2+LFJc6Xw6rhmpDbN1NSmhoFLWBh62cPG/P+IfaTSGY=
339+
k8s.io/client-go v0.31.7/go.mod h1:hrrMorBQ17LqzoKIxKg5cSWvmWl94EwA/MUF0Mkf+Zw=
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=

‎internal/http/download_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func TestDownload_CancelRequest(t *testing.T) {
4545
if urlErr := (*url.Error)(nil); assert.ErrorAs(t, err, &urlErr) {
4646
assert.Equal(t, "Get", urlErr.Op)
4747
assert.Equal(t, "http://404.example.com", urlErr.URL)
48-
assert.Equal(t, context.Canceled, urlErr.Err)
48+
assert.Equal(t, assert.AnError, urlErr.Err)
4949
}
5050
}
5151

@@ -110,7 +110,6 @@ func TestDownload_CancelDownload(t *testing.T) {
110110

111111
assert.ErrorContains(t, err, "while downloading: ")
112112
assert.ErrorIs(t, err, assert.AnError)
113-
assert.ErrorIs(t, err, context.Canceled)
114113
}
115114

116115
func TestDownload_RedirectLoop(t *testing.T) {

‎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.6+k0s.0"
64+
version: "1.31.7+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.6+k0s.0
102-
INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.31.6+k0s.0
103-
INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.31.6+k0s.0
101+
INFO [ssh] 3.250.52.147:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.31.7+k0s.0
102+
INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.31.7+k0s.0
103+
INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.31.7+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.6+k0s.0 is now installed
127+
INFO k0s cluster version v1.31.7+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.6
155+
--kubernetes-version=v1.31.7
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.6+k0s.0
2+
version: v1.31.7+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.5/config/v1alpha1/types.go#L27-L48
52+
// @see https://github.com/kubernetes/kube-proxy/blob/v0.31.7/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.5/config/v1alpha1/types.go#L52-L78
62+
// @see https://github.com/kubernetes/kube-proxy/blob/v0.31.7/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.5/config/v1alpha1/types.go#L82-L97
75+
// @see https://github.com/kubernetes/kube-proxy/blob/v0.31.7/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.6"
89+
KubeProxyImageVersion = "v1.31.7"
9090
CoreDNSImage = "quay.io/k0sproject/coredns"
9191
CoreDNSImageVersion = "1.11.4"
9292
EnvoyProxyImage = "quay.io/k0sproject/envoy-distroless"

0 commit comments

Comments
 (0)