Skip to content

Commit 2d536eb

Browse files
juanluisvaladasjuanluisvaladas
authored
Merge pull request #5711 from juanluisvaladas/bump-v1.29.15
[release-1.29]Bump kubernetes to 1.29.15
2 parents 4f3a6d9 + ed2ce59 commit 2d536eb

File tree

16 files changed

+113
-121
lines changed

16 files changed

+113
-121
lines changed

‎embedded-bins/Makefile.variables

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
alpine_version = 3.19
22
alpine_patch_version = $(alpine_version).7
33
golang_buildimage=docker.io/library/golang:$(go_version)-alpine3.20
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.29.14
25+
kubernetes_version = 1.29.15
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.14/bin/linux/amd64/kubectl && \
5+
RUN curl -L -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.29.15/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
@@ -66,20 +66,20 @@ require (
6666

6767
// Kubernetes
6868
require (
69-
k8s.io/api v0.29.14
70-
k8s.io/apiextensions-apiserver v0.29.14
71-
k8s.io/apimachinery v0.29.14
72-
k8s.io/cli-runtime v0.29.14
73-
k8s.io/client-go v0.29.14
74-
k8s.io/cloud-provider v0.29.14
75-
k8s.io/component-base v0.29.14
76-
k8s.io/component-helpers v0.29.14
77-
k8s.io/cri-api v0.29.14
78-
k8s.io/kube-aggregator v0.29.14
79-
k8s.io/kubectl v0.29.14
80-
k8s.io/kubelet v0.29.14
81-
k8s.io/kubernetes v1.29.14
82-
k8s.io/mount-utils v0.29.14
69+
k8s.io/api v0.29.15
70+
k8s.io/apiextensions-apiserver v0.29.15
71+
k8s.io/apimachinery v0.29.15
72+
k8s.io/cli-runtime v0.29.15
73+
k8s.io/client-go v0.29.15
74+
k8s.io/cloud-provider v0.29.15
75+
k8s.io/component-base v0.29.15
76+
k8s.io/component-helpers v0.29.15
77+
k8s.io/cri-api v0.29.15
78+
k8s.io/kube-aggregator v0.29.15
79+
k8s.io/kubectl v0.29.15
80+
k8s.io/kubelet v0.29.15
81+
k8s.io/kubernetes v1.29.15
82+
k8s.io/mount-utils v0.29.15
8383
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
8484
sigs.k8s.io/controller-runtime v0.17.0
8585
sigs.k8s.io/yaml v1.4.0
@@ -275,12 +275,12 @@ require (
275275
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
276276
gopkg.in/yaml.v2 v2.4.0 // indirect
277277
gopkg.in/yaml.v3 v3.0.1 // indirect
278-
k8s.io/apiserver v0.29.14 // indirect
279-
k8s.io/controller-manager v0.29.14 // indirect
278+
k8s.io/apiserver v0.29.15 // indirect
279+
k8s.io/controller-manager v0.29.15 // indirect
280280
k8s.io/klog/v2 v2.110.1 // indirect
281-
k8s.io/kms v0.29.14 // indirect
281+
k8s.io/kms v0.29.15 // indirect
282282
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
283-
k8s.io/metrics v0.29.14 // indirect
283+
k8s.io/metrics v0.29.15 // indirect
284284
oras.land/oras-go v1.2.4 // indirect
285285
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
286286
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
@@ -292,35 +292,35 @@ require (
292292

293293
// Replacements duplicated from upstream Kubernetes
294294
replace (
295-
// https://github.com/kubernetes/kubernetes/blob/v1.29.14/go.mod#L251-L282
296-
k8s.io/api => k8s.io/api v0.29.14
297-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.14
298-
k8s.io/apimachinery => k8s.io/apimachinery v0.29.14
299-
k8s.io/apiserver => k8s.io/apiserver v0.29.14
300-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.14
301-
k8s.io/client-go => k8s.io/client-go v0.29.14
302-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.14
303-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.14
304-
k8s.io/code-generator => k8s.io/code-generator v0.29.14
305-
k8s.io/component-base => k8s.io/component-base v0.29.14
306-
k8s.io/component-helpers => k8s.io/component-helpers v0.29.14
307-
k8s.io/controller-manager => k8s.io/controller-manager v0.29.14
308-
k8s.io/cri-api => k8s.io/cri-api v0.29.14
309-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.14
310-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.14
311-
k8s.io/endpointslice => k8s.io/endpointslice v0.29.14
312-
k8s.io/kms => k8s.io/kms v0.29.14
313-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.14
314-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.14
315-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.14
316-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.14
317-
k8s.io/kubectl => k8s.io/kubectl v0.29.14
318-
k8s.io/kubelet => k8s.io/kubelet v0.29.14
319-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.14
320-
k8s.io/metrics => k8s.io/metrics v0.29.14
321-
k8s.io/mount-utils => k8s.io/mount-utils v0.29.14
322-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.14
323-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.14
324-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.29.14
325-
k8s.io/sample-controller => k8s.io/sample-controller v0.29.14
295+
// https://github.com/kubernetes/kubernetes/blob/v1.29.15/go.mod#L251-L282
296+
k8s.io/api => k8s.io/api v0.29.15
297+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.15
298+
k8s.io/apimachinery => k8s.io/apimachinery v0.29.15
299+
k8s.io/apiserver => k8s.io/apiserver v0.29.15
300+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.15
301+
k8s.io/client-go => k8s.io/client-go v0.29.15
302+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.15
303+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.15
304+
k8s.io/code-generator => k8s.io/code-generator v0.29.15
305+
k8s.io/component-base => k8s.io/component-base v0.29.15
306+
k8s.io/component-helpers => k8s.io/component-helpers v0.29.15
307+
k8s.io/controller-manager => k8s.io/controller-manager v0.29.15
308+
k8s.io/cri-api => k8s.io/cri-api v0.29.15
309+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.15
310+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.15
311+
k8s.io/endpointslice => k8s.io/endpointslice v0.29.15
312+
k8s.io/kms => k8s.io/kms v0.29.15
313+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.15
314+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.15
315+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.15
316+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.15
317+
k8s.io/kubectl => k8s.io/kubectl v0.29.15
318+
k8s.io/kubelet => k8s.io/kubelet v0.29.15
319+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.15
320+
k8s.io/metrics => k8s.io/metrics v0.29.15
321+
k8s.io/mount-utils => k8s.io/mount-utils v0.29.15
322+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.15
323+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.15
324+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.29.15
325+
k8s.io/sample-controller => k8s.io/sample-controller v0.29.15
326326
)

‎go.sum

+36-36
Original file line numberDiff line numberDiff line change
@@ -928,46 +928,46 @@ helm.sh/helm/v3 v3.14.4 h1:6FSpEfqyDalHq3kUr4gOMThhgY55kXUEjdQoyODYnrM=
928928
helm.sh/helm/v3 v3.14.4/go.mod h1:Tje7LL4gprZpuBNTbG34d1Xn5NmRT3OWfBRwpOSer9I=
929929
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
930930
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
931-
k8s.io/api v0.29.14 h1:JWFh5ufowH3Y6tCgEzY3URVJHb27f0tEDEej0nCjWDw=
932-
k8s.io/api v0.29.14/go.mod h1:IV8YqKxMm8JGLBLlHM13Npn5lCITH10XYipWEW+YEOQ=
933-
k8s.io/apiextensions-apiserver v0.29.14 h1:gw9WXrZJPu5kpI1UC+Wf8BVe9PWwRUB/UZXU8VzBsq4=
934-
k8s.io/apiextensions-apiserver v0.29.14/go.mod h1:TJ51W+HKW2XqTtAsEFOz1/OohsMtekbKaTXh8ldioL4=
935-
k8s.io/apimachinery v0.29.14 h1:IDhwnGNCp836SLOwW1SoEfFNV77wxIklhxeAHX9vmSo=
936-
k8s.io/apimachinery v0.29.14/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y=
937-
k8s.io/apiserver v0.29.14 h1:XTo9lDDsG4NkywEuzG0SDLrBv6+AyVIpqVzZjg+pWRs=
938-
k8s.io/apiserver v0.29.14/go.mod h1:jC0HqUfqFKMp111xs97CXkf8XTQXtnbukRuuwDH74yE=
939-
k8s.io/cli-runtime v0.29.14 h1:CJis59afFwxzV4RBKR6rpS94C5onIypVsRqq4hyydPk=
940-
k8s.io/cli-runtime v0.29.14/go.mod h1:PBDI2lTaFj/qdNx5C6HGlCH+KMmtl1JVJcmCLMveTc4=
941-
k8s.io/client-go v0.29.14 h1:OSnzZ9DClaFRgl3zMAY2kGZhNjdGJkEb+RDz+MW2h6k=
942-
k8s.io/client-go v0.29.14/go.mod h1:XtZt5n5UxKfPJ+sCoTPcEavWgZbLFFxMnAFFRQGK1RY=
943-
k8s.io/cloud-provider v0.29.14 h1:c51wR9EO+hHfwwXo4nKpNx2hSpPsnC0K06pNr+LfYT8=
944-
k8s.io/cloud-provider v0.29.14/go.mod h1:WC35HM3tTzyOCg8+W2exZPKAfSClK3RpTzGXOBpQcbg=
945-
k8s.io/component-base v0.29.14 h1:SF1DWN7bc2VloJ/ysegGoi/aHnopEo81aw9CslhqXIw=
946-
k8s.io/component-base v0.29.14/go.mod h1:FoK1PHhFTaEQVvQLw29/Uyfd8Ug0qUKHrUcXIXJ1VxI=
947-
k8s.io/component-helpers v0.29.14 h1:xVdPm0SAlQlclESC/3Q3DV6mRkyWZiOfG+jEEaEveyM=
948-
k8s.io/component-helpers v0.29.14/go.mod h1:vpLvJu1de/+ZCPdj34549/b83FG6/djZsFzCWt6Qses=
949-
k8s.io/controller-manager v0.29.14 h1:36yBWP2khQ2OiQezHMOoBdlEkUkytBwIApZ5QlN/WYs=
950-
k8s.io/controller-manager v0.29.14/go.mod h1:VWFCAJrb9umWPKmmus3wgjSdN0wKqgI97Rb5XeukGdQ=
951-
k8s.io/cri-api v0.29.14 h1:ajYndA+B4nmfHDQ8nN1G+7zsaWFc9lgZS3T30+LvIs4=
952-
k8s.io/cri-api v0.29.14/go.mod h1:A6pdbjzML2xi9B0Clqn5qt1HJ3Ik12x2j+jv/TkqjRE=
931+
k8s.io/api v0.29.15 h1:QxPcAheYujeBwkdiE0vMyKkAtqUq5YNyXVqimT+me44=
932+
k8s.io/api v0.29.15/go.mod h1:16duIp2ez6GiLPq1g8XtZNIkw6hJpIitpxZSvv0dZ6E=
933+
k8s.io/apiextensions-apiserver v0.29.15 h1:XI5axgsWqMlIIgpHbcz5vPjk06i3ibHv5FUdSfdtQLU=
934+
k8s.io/apiextensions-apiserver v0.29.15/go.mod h1:6ZU61z32I8WUwbBTPIANUesTj5G40sZek0ojmeoMJI8=
935+
k8s.io/apimachinery v0.29.15 h1:aLc0wghElkdnTO7TMVTxTrifoXah1lqRL8s6szDHGbg=
936+
k8s.io/apimachinery v0.29.15/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y=
937+
k8s.io/apiserver v0.29.15 h1:OgRJ1fJggTkpgZkRoz9kNsAONp3IvnvnbztQyI5NyB4=
938+
k8s.io/apiserver v0.29.15/go.mod h1:IMISpOFrCpr10Wbgs+FX6fyOZuDWFFCuaHTrxSrtdpU=
939+
k8s.io/cli-runtime v0.29.15 h1:DLucYFyRTyYfRADJEIJ3270Kx6a4C9Ac+o1FkknyZyM=
940+
k8s.io/cli-runtime v0.29.15/go.mod h1:EjQsNazuwZWLTXLCCP4jGpkd95UO6wXKLVguSqfjwaU=
941+
k8s.io/client-go v0.29.15 h1:zCBOXKCtz9Hl8boKUGs8zbtZEP6pc7O8Ov3ma+gnS6o=
942+
k8s.io/client-go v0.29.15/go.mod h1:xPy0D3p4sonPhZhI3QoYo4m7oLKoPjFf4vYF9oxoxNM=
943+
k8s.io/cloud-provider v0.29.15 h1:vB44rOpQclJXJVeXO2XP30yuS0m+FYwvms/DFe6L86U=
944+
k8s.io/cloud-provider v0.29.15/go.mod h1:TP6lfQ3IjFyGpPAt8wzTOYQQNHY4efEbAt0s/F55Vu8=
945+
k8s.io/component-base v0.29.15 h1:CvmXXTDyk43FDaiJ/Rp+yWFjw6hkUI2t7mIJUrK5j00=
946+
k8s.io/component-base v0.29.15/go.mod h1:jH/sbuvmXew2Fz2iIKNMeNw8o/d1KR9tAg6uekQKnVk=
947+
k8s.io/component-helpers v0.29.15 h1:6GwLW0bHiMfDa/RmqeXK0GuIEdLNdtB5WThPp6uC2Cc=
948+
k8s.io/component-helpers v0.29.15/go.mod h1:OCeOqb4i+uE6Lf1CXKxVoII1pyJnFoejcfj12Gnu4RU=
949+
k8s.io/controller-manager v0.29.15 h1:kfX2YVJfF6kKegVKxvUrhmWJz3powLLSFdZGJIzh7ik=
950+
k8s.io/controller-manager v0.29.15/go.mod h1:xNhBwIJgAPqh7EbTp3hXKsOE94ZPY3gH3D189cu3Z8M=
951+
k8s.io/cri-api v0.29.15 h1:FLp4Zpmipml7OPNSOCrMVzLQP4ekAqWiIJYlJOud4Ok=
952+
k8s.io/cri-api v0.29.15/go.mod h1:A6pdbjzML2xi9B0Clqn5qt1HJ3Ik12x2j+jv/TkqjRE=
953953
k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
954954
k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
955-
k8s.io/kms v0.29.14 h1:F5bZZnUtqR7lC9YeXZyaHXNbRo/Lqrrm2BbBcLQ2mhM=
956-
k8s.io/kms v0.29.14/go.mod h1:vWVImKkJd+1BQY4tBwdfSwjQBiLrnbNtHADcDEDQFtk=
957-
k8s.io/kube-aggregator v0.29.14 h1:RxT+HsddIHtbVmjqyLViMNPGQOM4RY3j87UwI8vMxKw=
958-
k8s.io/kube-aggregator v0.29.14/go.mod h1:Bq2rKUjiTWcQQRkCljvp24ZF+YFefs0CLIeJEbUj7fU=
955+
k8s.io/kms v0.29.15 h1:IthwT/4v3N1NnFPuj4NgCeGRBylAN5cj2RK0qUdOiEY=
956+
k8s.io/kms v0.29.15/go.mod h1:vWVImKkJd+1BQY4tBwdfSwjQBiLrnbNtHADcDEDQFtk=
957+
k8s.io/kube-aggregator v0.29.15 h1:pDw+YxD7Ck4w3xfiI//F33/DKSucFaoLcRnT7c1OSoc=
958+
k8s.io/kube-aggregator v0.29.15/go.mod h1:SMhrzIpA4Y64825YIUWhaGc/uCZnIH+7bjljPEnoVbw=
959959
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780=
960960
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
961-
k8s.io/kubectl v0.29.14 h1:aNsAv4S8s6ldP8pPejkgPdNBBTeL/9vnl6j72F3b1z4=
962-
k8s.io/kubectl v0.29.14/go.mod h1:/fKgBbMs87f5iWI2s2K4IFofr9tpYZ8kE9Q2m6zA4OY=
963-
k8s.io/kubelet v0.29.14 h1:kkjpSJ6W+jrzr2AwOpVrOMY7iu3uim7RO+EC2zBVOzY=
964-
k8s.io/kubelet v0.29.14/go.mod h1:4FD4VXVnoCxXv0VnI3LKTYYtGtmWL3UEI/Q6/Y1hskk=
965-
k8s.io/kubernetes v1.29.14 h1:mbk5M/WaJr/AX7p3p2/7eJjrtI+I3AKu7IEjI8+Ny/U=
966-
k8s.io/kubernetes v1.29.14/go.mod h1:L6/pfKQZ6Tv2O8gyT4OxhGZp+nNsjV54xtNodRoup9k=
967-
k8s.io/metrics v0.29.14 h1:Gr/Z4lnm8pB4xfcEn3wgG+pScQVRpgZVrT5ERbfF2EQ=
968-
k8s.io/metrics v0.29.14/go.mod h1:fCkxA8GHuJ77QqyHo7MJmUP9lnzYuUZYy+RbmHDzjeI=
969-
k8s.io/mount-utils v0.29.14 h1:0ml7abObwEB8YsAlnBOxlBw6FfaWL7mQNikrjNk1WPQ=
970-
k8s.io/mount-utils v0.29.14/go.mod h1:SHUMR9n3b6tLgEmlyT36cL6fV6Sjwa5CJhc0guCXvb0=
961+
k8s.io/kubectl v0.29.15 h1:4SlCkeQCHxajyAtwls5HtA4RWaQZxCqHFdVFw3HK3VQ=
962+
k8s.io/kubectl v0.29.15/go.mod h1:sOkySjo4fKIAI9tDEElszU9kW4Pc1+1B6zALV8SbBxs=
963+
k8s.io/kubelet v0.29.15 h1:aEoVJCW6eR+2rY2sdO/I9w5p0nTu/jSOeUBfRHFWjTY=
964+
k8s.io/kubelet v0.29.15/go.mod h1:l4IrTn+YrG/1i993gNiVs0uhk4nAUx1gGshR+vO3BOA=
965+
k8s.io/kubernetes v1.29.15 h1:hLcyf3XmxtfkubCEmmPX5QVD7lDclXjvEUrJeP283LM=
966+
k8s.io/kubernetes v1.29.15/go.mod h1:L6/pfKQZ6Tv2O8gyT4OxhGZp+nNsjV54xtNodRoup9k=
967+
k8s.io/metrics v0.29.15 h1:RP6r8va0wB2vqG7dI/A3wEPl/qxGacazTa+e5cN+FOg=
968+
k8s.io/metrics v0.29.15/go.mod h1:hBIJSQnwRYaiRNpk0BdyErRmRYnr9fD1xZBwpIyDFbQ=
969+
k8s.io/mount-utils v0.29.15 h1:CnOqHmL9ZlxvUweywviXhy0CqhrM8lRxrcGXQDtHvDk=
970+
k8s.io/mount-utils v0.29.15/go.mod h1:SHUMR9n3b6tLgEmlyT36cL6fV6Sjwa5CJhc0guCXvb0=
971971
k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
972972
k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
973973
oras.land/oras-go v1.2.4 h1:djpBY2/2Cs1PV87GSJlxv4voajVOMZxqqtq9AB8YNvY=

‎hack/tool/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -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.14 // indirect
96-
k8s.io/client-go v0.29.14 // indirect
95+
k8s.io/apimachinery v0.29.15 // indirect
96+
k8s.io/client-go v0.29.15 // 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

+6-8
Original file line numberDiff line numberDiff line change
@@ -338,14 +338,12 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
338338
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
339339
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
340340
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
341-
k8s.io/api v0.29.13 h1:VkMIbjJw1t2VgTatg8ggzI93LOfFa8z8SzAYzXtWuEg=
342-
k8s.io/api v0.29.13/go.mod h1:fBWhXqqE25b46PZEVA2DXN2EuhNg1ZT3VRyb5JitLG8=
343-
k8s.io/apimachinery v0.29.13 h1:a7I4uQtlfaL+UTRGFhl8lLd2nHBR7qt+axhQLtpLYMg=
344-
k8s.io/apimachinery v0.29.13/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y=
345-
k8s.io/apimachinery v0.29.14/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y=
346-
k8s.io/client-go v0.29.13 h1:M2scR9NWGlzI2YoIxTgwx2N3OA+dXqN87zsM4tvewmA=
347-
k8s.io/client-go v0.29.13/go.mod h1:BBzF0Pr78Y8DM20j22E6tOMwTBpFaKnSnn6N0pNe4VE=
348-
k8s.io/client-go v0.29.14/go.mod h1:XtZt5n5UxKfPJ+sCoTPcEavWgZbLFFxMnAFFRQGK1RY=
341+
k8s.io/api v0.29.15 h1:QxPcAheYujeBwkdiE0vMyKkAtqUq5YNyXVqimT+me44=
342+
k8s.io/api v0.29.15/go.mod h1:16duIp2ez6GiLPq1g8XtZNIkw6hJpIitpxZSvv0dZ6E=
343+
k8s.io/apimachinery v0.29.15 h1:aLc0wghElkdnTO7TMVTxTrifoXah1lqRL8s6szDHGbg=
344+
k8s.io/apimachinery v0.29.15/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y=
345+
k8s.io/client-go v0.29.15 h1:zCBOXKCtz9Hl8boKUGs8zbtZEP6pc7O8Ov3ma+gnS6o=
346+
k8s.io/client-go v0.29.15/go.mod h1:xPy0D3p4sonPhZhI3QoYo4m7oLKoPjFf4vYF9oxoxNM=
349347
k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
350348
k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
351349
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780=

‎hack/tools/Makefile.variables

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
controller-gen_version = 0.14.0
22
go-bindata_version = 3.23.0+incompatible
3-
golangci-lint_version = 1.57.1
3+
golangci-lint_version = 1.60.3

‎inttest/cli/cli_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func (s *CliSuite) TestK0sCliKubectlAndResetCommand() {
6262
s.T().Run("sysinfoSmoketest", func(t *testing.T) {
6363
out, err := ssh.ExecWithOutput(s.Context(), fmt.Sprintf("%s sysinfo", s.K0sFullPath))
6464
assert.NoError(t, err, "k0s sysinfo has non-zero exit code")
65-
t.Logf(out)
65+
t.Log(out)
6666
assert.Regexp(t, "^Machine ID: ", out)
6767
assert.Regexp(t, "\nOperating system: Linux \\(pass\\)\n", out)
6868
assert.Regexp(t, "\n Linux kernel release: ", out)

‎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.14+k0s.0"
64+
version: "1.29.15+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.14+k0s.0
102-
INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.29.14+k0s.0
103-
INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.29.14+k0s.0
101+
INFO [ssh] 3.250.52.147:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.29.15+k0s.0
102+
INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.29.15+k0s.0
103+
INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.29.15+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.14+k0s.0 is now installed
127+
INFO k0s cluster version v1.29.15+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.14
155+
--kubernetes-version=v1.29.15
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.14+k0s.0
2+
version: v1.29.15+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.14/config/v1alpha1/types.go#L27-L48
44+
// @see https://github.com/kubernetes/kube-proxy/blob/v0.29.15/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.14/config/v1alpha1/types.go#L52-L78
54+
// @see https://github.com/kubernetes/kube-proxy/blob/v0.29.15/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/apis/k0s/v1beta1/storage.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ func (e *EtcdConfig) GetKeyFilePath(certDir string) string {
233233
func validateRequiredProperties(e *ExternalCluster) []error {
234234
var errors []error
235235

236-
if e.Endpoints == nil || len(e.Endpoints) == 0 {
236+
if len(e.Endpoints) == 0 {
237237
errors = append(errors, fmt.Errorf("spec.storage.etcd.externalCluster.endpoints cannot be null or empty"))
238238
} else if slices.Contains(e.Endpoints, "") {
239239
errors = append(errors, fmt.Errorf("spec.storage.etcd.externalCluster.endpoints cannot contain empty strings"))

0 commit comments

Comments
 (0)