Skip to content

Commit c1c0804

Browse files
twz123twz123
authored
Merge pull request #4304 from twz123/bump-k8s
Bump Kubernetes to v1.29.4
2 parents 3b9e25e + 316a78f commit c1c0804

File tree

12 files changed

+111
-111
lines changed

12 files changed

+111
-111
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.29.3+k0s.0")'
6+
description: 'Version tag (e.g."v1.29.4+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.29.3
25+
kubernetes_version = 1.29.4
2626
helm_version = 3.11.1
2727
kubernetes_buildimage = $(golang_buildimage)
2828
kubernetes_build_go_tags = "providerless"

‎examples/bootloose-ha-controllers/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM quay.io/k0sproject/bootloose-ubuntu18.04
22

33
ADD k0s.service /etc/systemd/system/k0s.service
44

5-
RUN curl -L -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.29.3/bin/linux/amd64/kubectl && \
5+
RUN curl -L -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.29.4/bin/linux/amd64/kubectl && \
66
chmod +x /usr/local/bin/kubectl
77

88
ENV KUBECONFIG=/var/lib/k0s/pki/admin.conf

‎go.mod

+49-49
Original file line numberDiff line numberDiff line change
@@ -64,20 +64,20 @@ require (
6464

6565
// Kubernetes
6666
require (
67-
k8s.io/api v0.29.3
68-
k8s.io/apiextensions-apiserver v0.29.3
69-
k8s.io/apimachinery v0.29.3
70-
k8s.io/cli-runtime v0.29.3
71-
k8s.io/client-go v0.29.3
72-
k8s.io/cloud-provider v0.29.3
73-
k8s.io/component-base v0.29.3
74-
k8s.io/component-helpers v0.29.3
75-
k8s.io/cri-api v0.29.3
76-
k8s.io/kube-aggregator v0.29.3
77-
k8s.io/kubectl v0.29.3
78-
k8s.io/kubelet v0.29.3
79-
k8s.io/kubernetes v1.29.3
80-
k8s.io/mount-utils v0.29.3
67+
k8s.io/api v0.29.4
68+
k8s.io/apiextensions-apiserver v0.29.4
69+
k8s.io/apimachinery v0.29.4
70+
k8s.io/cli-runtime v0.29.4
71+
k8s.io/client-go v0.29.4
72+
k8s.io/cloud-provider v0.29.4
73+
k8s.io/component-base v0.29.4
74+
k8s.io/component-helpers v0.29.4
75+
k8s.io/cri-api v0.29.4
76+
k8s.io/kube-aggregator v0.29.4
77+
k8s.io/kubectl v0.29.4
78+
k8s.io/kubelet v0.29.4
79+
k8s.io/kubernetes v1.29.4
80+
k8s.io/mount-utils v0.29.4
8181
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
8282
sigs.k8s.io/controller-runtime v0.17.2
8383
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.29.3 // indirect
275-
k8s.io/controller-manager v0.29.3 // indirect
274+
k8s.io/apiserver v0.29.4 // indirect
275+
k8s.io/controller-manager v0.29.4 // indirect
276276
k8s.io/klog/v2 v2.110.1 // indirect
277-
k8s.io/kms v0.29.3 // indirect
277+
k8s.io/kms v0.29.4 // indirect
278278
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
279-
k8s.io/metrics v0.29.3 // indirect
279+
k8s.io/metrics v0.29.4 // indirect
280280
oras.land/oras-go v1.2.4 // indirect
281281
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // 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.29.3/go.mod#L251-L282
292-
k8s.io/api => k8s.io/api v0.29.3
293-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.3
294-
k8s.io/apimachinery => k8s.io/apimachinery v0.29.3
295-
k8s.io/apiserver => k8s.io/apiserver v0.29.3
296-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.3
297-
k8s.io/client-go => k8s.io/client-go v0.29.3
298-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.3
299-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.3
300-
k8s.io/code-generator => k8s.io/code-generator v0.29.3
301-
k8s.io/component-base => k8s.io/component-base v0.29.3
302-
k8s.io/component-helpers => k8s.io/component-helpers v0.29.3
303-
k8s.io/controller-manager => k8s.io/controller-manager v0.29.3
304-
k8s.io/cri-api => k8s.io/cri-api v0.29.3
305-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.3
306-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.3
307-
k8s.io/endpointslice => k8s.io/endpointslice v0.29.3
308-
k8s.io/kms => k8s.io/kms v0.29.3
309-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.3
310-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.3
311-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.3
312-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.3
313-
k8s.io/kubectl => k8s.io/kubectl v0.29.3
314-
k8s.io/kubelet => k8s.io/kubelet v0.29.3
315-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.3
316-
k8s.io/metrics => k8s.io/metrics v0.29.3
317-
k8s.io/mount-utils => k8s.io/mount-utils v0.29.3
318-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.3
319-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.3
320-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.29.3
321-
k8s.io/sample-controller => k8s.io/sample-controller v0.29.3
291+
// https://github.com/kubernetes/kubernetes/blob/v1.29.4/go.mod#L251-L282
292+
k8s.io/api => k8s.io/api v0.29.4
293+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.4
294+
k8s.io/apimachinery => k8s.io/apimachinery v0.29.4
295+
k8s.io/apiserver => k8s.io/apiserver v0.29.4
296+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.4
297+
k8s.io/client-go => k8s.io/client-go v0.29.4
298+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.4
299+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.4
300+
k8s.io/code-generator => k8s.io/code-generator v0.29.4
301+
k8s.io/component-base => k8s.io/component-base v0.29.4
302+
k8s.io/component-helpers => k8s.io/component-helpers v0.29.4
303+
k8s.io/controller-manager => k8s.io/controller-manager v0.29.4
304+
k8s.io/cri-api => k8s.io/cri-api v0.29.4
305+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.4
306+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.4
307+
k8s.io/endpointslice => k8s.io/endpointslice v0.29.4
308+
k8s.io/kms => k8s.io/kms v0.29.4
309+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.4
310+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.4
311+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.4
312+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.4
313+
k8s.io/kubectl => k8s.io/kubectl v0.29.4
314+
k8s.io/kubelet => k8s.io/kubelet v0.29.4
315+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.4
316+
k8s.io/metrics => k8s.io/metrics v0.29.4
317+
k8s.io/mount-utils => k8s.io/mount-utils v0.29.4
318+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.4
319+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.4
320+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.29.4
321+
k8s.io/sample-controller => k8s.io/sample-controller v0.29.4
322322
)

‎go.sum

+36-36
Original file line numberDiff line numberDiff line change
@@ -913,46 +913,46 @@ helm.sh/helm/v3 v3.14.4 h1:6FSpEfqyDalHq3kUr4gOMThhgY55kXUEjdQoyODYnrM=
913913
helm.sh/helm/v3 v3.14.4/go.mod h1:Tje7LL4gprZpuBNTbG34d1Xn5NmRT3OWfBRwpOSer9I=
914914
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
915915
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
916-
k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw=
917-
k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80=
918-
k8s.io/apiextensions-apiserver v0.29.3 h1:9HF+EtZaVpFjStakF4yVufnXGPRppWFEQ87qnO91YeI=
919-
k8s.io/apiextensions-apiserver v0.29.3/go.mod h1:po0XiY5scnpJfFizNGo6puNU6Fq6D70UJY2Cb2KwAVc=
920-
k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU=
921-
k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU=
922-
k8s.io/apiserver v0.29.3 h1:xR7ELlJ/BZSr2n4CnD3lfA4gzFivh0wwfNfz9L0WZcE=
923-
k8s.io/apiserver v0.29.3/go.mod h1:hrvXlwfRulbMbBgmWRQlFru2b/JySDpmzvQwwk4GUOs=
924-
k8s.io/cli-runtime v0.29.3 h1:r68rephmmytoywkw2MyJ+CxjpasJDQY7AGc3XY2iv1k=
925-
k8s.io/cli-runtime v0.29.3/go.mod h1:aqVUsk86/RhaGJwDhHXH0jcdqBrgdF3bZWk4Z9D4mkM=
926-
k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg=
927-
k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0=
928-
k8s.io/cloud-provider v0.29.3 h1:y39hNq0lrPD1qmqQ2ykwMJGeWF9LsepVkR2a4wskwLc=
929-
k8s.io/cloud-provider v0.29.3/go.mod h1:daDV1WkAO6pTrdsn7v8TpN/q9n75ExUC4RJDl7vlPKk=
930-
k8s.io/component-base v0.29.3 h1:Oq9/nddUxlnrCuuR2K/jp6aflVvc0uDvxMzAWxnGzAo=
931-
k8s.io/component-base v0.29.3/go.mod h1:Yuj33XXjuOk2BAaHsIGHhCKZQAgYKhqIxIjIr2UXYio=
932-
k8s.io/component-helpers v0.29.3 h1:1dqZswuZgT2ZMixYeORyCUOAApXxgsvjVSgfoUT+P4o=
933-
k8s.io/component-helpers v0.29.3/go.mod h1:yiDqbRQrnQY+sPju/bL7EkwDJb6LVOots53uZNMZBos=
934-
k8s.io/controller-manager v0.29.3 h1:pvm3mirypgW7kM6dHRk6O5ANZj4bZTWirfk5gO6RlCo=
935-
k8s.io/controller-manager v0.29.3/go.mod h1:RNxpf0d1WAo59sOLd32isWJP0oZ7Zxr+q4VEEaSq4gk=
936-
k8s.io/cri-api v0.29.3 h1:ppKSui+hhTJW774Mou6x+/ealmzt2jmTM0vsEQVWrjI=
937-
k8s.io/cri-api v0.29.3/go.mod h1:3X7EnhsNaQnCweGhQCJwKNHlH7wHEYuKQ19bRvXMoJY=
916+
k8s.io/api v0.29.4 h1:WEnF/XdxuCxdG3ayHNRR8yH3cI1B/llkWBma6bq4R3w=
917+
k8s.io/api v0.29.4/go.mod h1:DetSv0t4FBTcEpfA84NJV3g9a7+rSzlUHk5ADAYHUv0=
918+
k8s.io/apiextensions-apiserver v0.29.4 h1:M7hbuHU/ckbibR7yPbe6DyNWgTFKNmZDbdZKD8q1Smk=
919+
k8s.io/apiextensions-apiserver v0.29.4/go.mod h1:TTDC9fB+0kHY2rogf5hgBR03KBKCwED+GHUsXGpR7SM=
920+
k8s.io/apimachinery v0.29.4 h1:RaFdJiDmuKs/8cm1M6Dh1Kvyh59YQFDcFuFTSmXes6Q=
921+
k8s.io/apimachinery v0.29.4/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y=
922+
k8s.io/apiserver v0.29.4 h1:wPwGOO58GQOpRiZu59P5eRoDcB7QtV+QBglkRiXwCiM=
923+
k8s.io/apiserver v0.29.4/go.mod h1:VqTF9t98HVfhKZVRohCPezsdUt9u2g3bHKftxGcXoRo=
924+
k8s.io/cli-runtime v0.29.4 h1:QvUrddBxVX6XFJ6z64cGpEk7e4bQduKweqbqq+qBd9g=
925+
k8s.io/cli-runtime v0.29.4/go.mod h1:NmklYuZ4DLfOr2XEIT8Nzl883KMZUCv7KMj3wMHayCA=
926+
k8s.io/client-go v0.29.4 h1:79ytIedxVfyXV8rpH3jCBW0u+un0fxHDwX5F9K8dPR8=
927+
k8s.io/client-go v0.29.4/go.mod h1:kC1thZQ4zQWYwldsfI088BbK6RkxK+aF5ebV8y9Q4tk=
928+
k8s.io/cloud-provider v0.29.4 h1:XRKl818NKQWan4UZ7fXFAkEJLJkBFq5sQROrbLbryM4=
929+
k8s.io/cloud-provider v0.29.4/go.mod h1:sC7wyt5z5IRoNuU9JhEuMdRnhDEz6cWAJCyMcNUH9X8=
930+
k8s.io/component-base v0.29.4 h1:xeKzuuHI/1tjleu5jycDAcYbhAxeGHCQBZUY2eRIkOo=
931+
k8s.io/component-base v0.29.4/go.mod h1:pYjt+oEZP9gtmwSikwAJgfSBikqKX2gOqRat0QjmQt0=
932+
k8s.io/component-helpers v0.29.4 h1:lbVFhywtv64KlaIYTKszkHaFAqwCjNn7xyRTeWorzfI=
933+
k8s.io/component-helpers v0.29.4/go.mod h1:rMOVMGYEju7/GKMV0USfYAYJBIQdxlMMN1VFl/Mf2so=
934+
k8s.io/controller-manager v0.29.4 h1:rzEwLboRTXBZhYUY02nNhORHQlcXGDE3EPS2IZRd0cg=
935+
k8s.io/controller-manager v0.29.4/go.mod h1:XG6oraSxieDl6XBdO2HnkA6DwEfoCKS3OCpqO4Xb0zU=
936+
k8s.io/cri-api v0.29.4 h1:42A3QLU7rt+ME3JwgF/gTd/bWQCtknIsML/j8AZgNbQ=
937+
k8s.io/cri-api v0.29.4/go.mod h1:A6pdbjzML2xi9B0Clqn5qt1HJ3Ik12x2j+jv/TkqjRE=
938938
k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
939939
k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
940-
k8s.io/kms v0.29.3 h1:ReljsAUhYlm2spdT4yXmY+9a8x8dc/OT4mXvwQPPteQ=
941-
k8s.io/kms v0.29.3/go.mod h1:TBGbJKpRUMk59neTMDMddjIDL+D4HuFUbpuiuzmOPg0=
942-
k8s.io/kube-aggregator v0.29.3 h1:5KvTyFN8sQq2imq8tMAHWEKoE64Zg9WSMaGX78KV6ps=
943-
k8s.io/kube-aggregator v0.29.3/go.mod h1:xGJqV/SJJ1fbwTGfQLAZfwgqX1EMoaqfotDTkDrqqSk=
940+
k8s.io/kms v0.29.4 h1:cFGEoCLwoXk/eqYZppLZxybCdmEWeRKMCbm9f13IdRQ=
941+
k8s.io/kms v0.29.4/go.mod h1:vWVImKkJd+1BQY4tBwdfSwjQBiLrnbNtHADcDEDQFtk=
942+
k8s.io/kube-aggregator v0.29.4 h1:yT7vYtwIag4G8HNrktYZ3qz6p6oHKronMAXOw4eQ2WQ=
943+
k8s.io/kube-aggregator v0.29.4/go.mod h1:zBfe4iXXmw5HinNgN0JoAu5rpXdyCUvRfG99+FVOd68=
944944
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780=
945945
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
946-
k8s.io/kubectl v0.29.3 h1:RuwyyIU42MAISRIePaa8Q7A3U74Q9P4MoJbDFz9o3us=
947-
k8s.io/kubectl v0.29.3/go.mod h1:yCxfY1dbwgVdEt2zkJ6d5NNLOhhWgTyrqACIoFhpdd4=
948-
k8s.io/kubelet v0.29.3 h1:X9h0ZHzc+eUeNTaksbN0ItHyvGhQ7Z0HPjnQD2oHdwU=
949-
k8s.io/kubelet v0.29.3/go.mod h1:jDiGuTkFOUynyBKzOoC1xRSWlgAZ9UPcTYeFyjr6vas=
950-
k8s.io/kubernetes v1.29.3 h1:EuOAKN4zpiP+kBx/0e9yS5iBkPSyLml19juOqZxBtDw=
951-
k8s.io/kubernetes v1.29.3/go.mod h1:CP+Z+S9haxyB7J+nV6ywYry4dqlphArPXjcc0CsBVXc=
952-
k8s.io/metrics v0.29.3 h1:nN+eavbMQ7Kuif2tIdTr2/F2ec2E/SIAWSruTZ+Ye6U=
953-
k8s.io/metrics v0.29.3/go.mod h1:kb3tGGC4ZcIDIuvXyUE291RwJ5WmDu0tB4wAVZM6h2I=
954-
k8s.io/mount-utils v0.29.3 h1:iEcqPP7Vv8UClH8nnMfovtmy/04fIloRW9JuSXykoZ0=
955-
k8s.io/mount-utils v0.29.3/go.mod h1:9IWJTMe8tG0MYMLEp60xK9GYVeCdA3g4LowmnVi+t9Y=
946+
k8s.io/kubectl v0.29.4 h1:2LFrAznoDZjN8JFMSUcuhER5o+yjTLzWWbOiDzVjmd8=
947+
k8s.io/kubectl v0.29.4/go.mod h1:YTKRF9y1/ccqZ2bnpOWaJD8V7johKqZR/qOMq+0pfxU=
948+
k8s.io/kubelet v0.29.4 h1:6fTt4sTd5xqTtIhVoS7PkiFUBevQsyu3ZmENVvwY62M=
949+
k8s.io/kubelet v0.29.4/go.mod h1:lAu6Z17pxKwgM+9hsgGkqFjYTOhbc0dnZ6GNnlbjYW0=
950+
k8s.io/kubernetes v1.29.4 h1:n4VCbX9cUhxHI+zw+m2iZlzT73/mrEJBHIMeauh9g4U=
951+
k8s.io/kubernetes v1.29.4/go.mod h1:28sDhcb87LX5z3GWAKYmLrhrifxi4W9bEWua4DRTIvk=
952+
k8s.io/metrics v0.29.4 h1:06sZ63/Kt9HEb5GP/1y6xbHDz6XkxnHpu949UdXfoXQ=
953+
k8s.io/metrics v0.29.4/go.mod h1:ZN9peB0nLTqPZuwQna8ZUrPFJQ0i8QNH4pqRJopS+9c=
954+
k8s.io/mount-utils v0.29.4 h1:tW/URea4gtXlaVW7VObr52NQhS+z3SXTg1GUaFZjRL4=
955+
k8s.io/mount-utils v0.29.4/go.mod h1:SHUMR9n3b6tLgEmlyT36cL6fV6Sjwa5CJhc0guCXvb0=
956956
k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
957957
k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
958958
oras.land/oras-go v1.2.4 h1:djpBY2/2Cs1PV87GSJlxv4voajVOMZxqqtq9AB8YNvY=

‎hack/tool/go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ require (
8181
github.com/zclconf/go-cty v1.14.1 // indirect
8282
golang.org/x/crypto v0.21.0 // indirect
8383
golang.org/x/mod v0.14.0 // indirect
84-
golang.org/x/net v0.21.0 // indirect
84+
golang.org/x/net v0.23.0 // indirect
8585
golang.org/x/oauth2 v0.10.0 // indirect
8686
golang.org/x/sys v0.18.0 // indirect
8787
golang.org/x/term v0.18.0 // indirect
@@ -92,8 +92,8 @@ require (
9292
google.golang.org/protobuf v1.33.0 // indirect
9393
gopkg.in/inf.v0 v0.9.1 // indirect
9494
gopkg.in/yaml.v2 v2.4.0 // indirect
95-
k8s.io/apimachinery v0.29.3 // indirect
96-
k8s.io/client-go v0.29.3 // indirect
95+
k8s.io/apimachinery v0.29.4 // indirect
96+
k8s.io/client-go v0.29.4 // indirect
9797
k8s.io/klog/v2 v2.110.1 // indirect
9898
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
9999
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect

‎hack/tool/go.sum

+8-8
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
267267
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
268268
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
269269
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
270-
golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
271-
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
270+
golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
271+
golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
272272
golang.org/x/oauth2 v0.10.0 h1:zHCpF2Khkwy4mMB4bv0U37YtJdTGW8jI0glAApi0Kh8=
273273
golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI=
274274
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -337,12 +337,12 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
337337
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
338338
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
339339
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
340-
k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw=
341-
k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80=
342-
k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU=
343-
k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU=
344-
k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg=
345-
k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0=
340+
k8s.io/api v0.29.4 h1:WEnF/XdxuCxdG3ayHNRR8yH3cI1B/llkWBma6bq4R3w=
341+
k8s.io/api v0.29.4/go.mod h1:DetSv0t4FBTcEpfA84NJV3g9a7+rSzlUHk5ADAYHUv0=
342+
k8s.io/apimachinery v0.29.4 h1:RaFdJiDmuKs/8cm1M6Dh1Kvyh59YQFDcFuFTSmXes6Q=
343+
k8s.io/apimachinery v0.29.4/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y=
344+
k8s.io/client-go v0.29.4 h1:79ytIedxVfyXV8rpH3jCBW0u+un0fxHDwX5F9K8dPR8=
345+
k8s.io/client-go v0.29.4/go.mod h1:kC1thZQ4zQWYwldsfI088BbK6RkxK+aF5ebV8y9Q4tk=
346346
k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
347347
k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
348348
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780=

‎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.29.3+k0s.0"
64+
version: "1.29.4+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.29.3+k0s.0
102-
INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.29.3+k0s.0
103-
INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.29.3+k0s.0
101+
INFO [ssh] 3.250.52.147:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.29.4+k0s.0
102+
INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.29.4+k0s.0
103+
INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.29.4+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.29.3+k0s.0 is now installed
127+
INFO k0s cluster version v1.29.4+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.29.3
155+
--kubernetes-version=v1.29.4
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.29.3+k0s.0
2+
version: v1.29.4+k0s.0
33
downloadURLs:
44
k0s:
55
linux-amd64: ..../k0s-amd64

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ type KubeProxy struct {
4141
}
4242

4343
// KubeProxyIPTablesConfiguration contains iptables-related kube-proxy configuration
44-
// @see https://github.com/kubernetes/kube-proxy/blob/v0.29.3/config/v1alpha1/types.go#L27-L48
44+
// @see https://github.com/kubernetes/kube-proxy/blob/v0.29.4/config/v1alpha1/types.go#L27-L48
4545
type KubeProxyIPTablesConfiguration struct {
4646
MasqueradeBit *int32 `json:"masqueradeBit,omitempty"`
4747
MasqueradeAll bool `json:"masqueradeAll,omitempty"`
@@ -51,7 +51,7 @@ type KubeProxyIPTablesConfiguration struct {
5151
}
5252

5353
// KubeProxyIPVSConfiguration contains ipvs-related kube-proxy configuration
54-
// @see https://github.com/kubernetes/kube-proxy/blob/v0.29.3/config/v1alpha1/types.go#L52-L78
54+
// @see https://github.com/kubernetes/kube-proxy/blob/v0.29.4/config/v1alpha1/types.go#L52-L78
5555
type KubeProxyIPVSConfiguration struct {
5656
SyncPeriod metav1.Duration `json:"syncPeriod,omitempty"`
5757
MinSyncPeriod metav1.Duration `json:"minSyncPeriod,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.29.3"
89+
KubeProxyImageVersion = "v1.29.4"
9090
CoreDNSImage = "quay.io/k0sproject/coredns"
9191
CoreDNSImageVersion = "1.11.1"
9292
EnvoyProxyImage = "quay.io/k0sproject/envoy-distroless"

0 commit comments

Comments
 (0)