Skip to content

Commit

Permalink
Bump Kubernetes to v1.29.6
Browse files Browse the repository at this point in the history 
https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.29.md#changelog-since-v1295

Signed-off-by: Tom Wieczorek <[email protected]>
  • Loading branch information
@twz123
twz123 committed Jun 14, 2024
1 parent 25a846c commit 20a0acd
Show file tree
Hide file tree
Showing 12 changed files with 108 additions and 108 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish-docs-manual.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
workflow_dispatch:
inputs:
version:
description: 'Version tag (e.g."v1.29.5+k0s.0")'
description: 'Version tag (e.g."v1.29.6+k0s.0")'
required: true

env:
Expand Down
2 changes: 1 addition & 1 deletion embedded-bins/Makefile.variables
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ containerd_build_shim_go_cgo_enabled = 0
#containerd_build_go_ldflags =
containerd_build_go_ldflags_extra = "-w -s -extldflags=-static"

kubernetes_version = 1.29.5
kubernetes_version = 1.29.6
helm_version = 3.11.1
kubernetes_buildimage = $(golang_buildimage)
kubernetes_build_go_tags = "providerless"
Expand Down
2 changes: 1 addition & 1 deletion examples/bootloose-ha-controllers/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM quay.io/k0sproject/bootloose-ubuntu18.04

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

RUN curl -L -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.29.5/bin/linux/amd64/kubectl && \
RUN curl -L -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.29.6/bin/linux/amd64/kubectl && \
chmod +x /usr/local/bin/kubectl

ENV KUBECONFIG=/var/lib/k0s/pki/admin.conf
98 changes: 49 additions & 49 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,20 +66,20 @@ require (

// Kubernetes
require (
k8s.io/api v0.29.5
k8s.io/apiextensions-apiserver v0.29.5
k8s.io/apimachinery v0.29.5
k8s.io/cli-runtime v0.29.5
k8s.io/client-go v0.29.5
k8s.io/cloud-provider v0.29.5
k8s.io/component-base v0.29.5
k8s.io/component-helpers v0.29.5
k8s.io/cri-api v0.29.5
k8s.io/kube-aggregator v0.29.5
k8s.io/kubectl v0.29.5
k8s.io/kubelet v0.29.5
k8s.io/kubernetes v1.29.5
k8s.io/mount-utils v0.29.5
k8s.io/api v0.29.6
k8s.io/apiextensions-apiserver v0.29.6
k8s.io/apimachinery v0.29.6
k8s.io/cli-runtime v0.29.6
k8s.io/client-go v0.29.6
k8s.io/cloud-provider v0.29.6
k8s.io/component-base v0.29.6
k8s.io/component-helpers v0.29.6
k8s.io/cri-api v0.29.6
k8s.io/kube-aggregator v0.29.6
k8s.io/kubectl v0.29.6
k8s.io/kubelet v0.29.6
k8s.io/kubernetes v1.29.6
k8s.io/mount-utils v0.29.6
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
sigs.k8s.io/controller-runtime v0.17.0
sigs.k8s.io/yaml v1.4.0
Expand Down Expand Up @@ -273,12 +273,12 @@ require (
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiserver v0.29.5 // indirect
k8s.io/controller-manager v0.29.5 // indirect
k8s.io/apiserver v0.29.6 // indirect
k8s.io/controller-manager v0.29.6 // indirect
k8s.io/klog/v2 v2.110.1 // indirect
k8s.io/kms v0.29.5 // indirect
k8s.io/kms v0.29.6 // indirect
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
k8s.io/metrics v0.29.5 // indirect
k8s.io/metrics v0.29.6 // indirect
oras.land/oras-go v1.2.4 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
Expand All @@ -290,35 +290,35 @@ require (

// Replacements duplicated from upstream Kubernetes
replace (
// https://github.com/kubernetes/kubernetes/blob/v1.29.5/go.mod#L251-L282
k8s.io/api => k8s.io/api v0.29.5
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.5
k8s.io/apimachinery => k8s.io/apimachinery v0.29.5
k8s.io/apiserver => k8s.io/apiserver v0.29.5
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.5
k8s.io/client-go => k8s.io/client-go v0.29.5
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.5
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.5
k8s.io/code-generator => k8s.io/code-generator v0.29.5
k8s.io/component-base => k8s.io/component-base v0.29.5
k8s.io/component-helpers => k8s.io/component-helpers v0.29.5
k8s.io/controller-manager => k8s.io/controller-manager v0.29.5
k8s.io/cri-api => k8s.io/cri-api v0.29.5
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.5
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.5
k8s.io/endpointslice => k8s.io/endpointslice v0.29.5
k8s.io/kms => k8s.io/kms v0.29.5
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.5
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.5
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.5
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.5
k8s.io/kubectl => k8s.io/kubectl v0.29.5
k8s.io/kubelet => k8s.io/kubelet v0.29.5
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.5
k8s.io/metrics => k8s.io/metrics v0.29.5
k8s.io/mount-utils => k8s.io/mount-utils v0.29.5
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.5
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.5
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.29.5
k8s.io/sample-controller => k8s.io/sample-controller v0.29.5
// https://github.com/kubernetes/kubernetes/blob/v1.29.6/go.mod#L251-L282
k8s.io/api => k8s.io/api v0.29.6
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.6
k8s.io/apimachinery => k8s.io/apimachinery v0.29.6
k8s.io/apiserver => k8s.io/apiserver v0.29.6
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.6
k8s.io/client-go => k8s.io/client-go v0.29.6
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.6
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.6
k8s.io/code-generator => k8s.io/code-generator v0.29.6
k8s.io/component-base => k8s.io/component-base v0.29.6
k8s.io/component-helpers => k8s.io/component-helpers v0.29.6
k8s.io/controller-manager => k8s.io/controller-manager v0.29.6
k8s.io/cri-api => k8s.io/cri-api v0.29.6
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.6
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.6
k8s.io/endpointslice => k8s.io/endpointslice v0.29.6
k8s.io/kms => k8s.io/kms v0.29.6
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.6
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.6
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.6
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.6
k8s.io/kubectl => k8s.io/kubectl v0.29.6
k8s.io/kubelet => k8s.io/kubelet v0.29.6
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.6
k8s.io/metrics => k8s.io/metrics v0.29.6
k8s.io/mount-utils => k8s.io/mount-utils v0.29.6
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.6
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.6
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.29.6
k8s.io/sample-controller => k8s.io/sample-controller v0.29.6
)
72 changes: 36 additions & 36 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -914,46 +914,46 @@ helm.sh/helm/v3 v3.14.4 h1:6FSpEfqyDalHq3kUr4gOMThhgY55kXUEjdQoyODYnrM=
helm.sh/helm/v3 v3.14.4/go.mod h1:Tje7LL4gprZpuBNTbG34d1Xn5NmRT3OWfBRwpOSer9I=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.29.5 h1:levS+umUigHCfI3riD36pMY1vQEbrzh4r1ivVWAhHaI=
k8s.io/api v0.29.5/go.mod h1:7b18TtPcJzdjk7w5zWyIHgoAtpGeRvGGASxlS7UZXdQ=
k8s.io/apiextensions-apiserver v0.29.5 h1:njDywexhE6n+1NEl3A4axT0TMQHREnndrk3/ztdWcNE=
k8s.io/apiextensions-apiserver v0.29.5/go.mod h1:pfIvij+MH9a8NQKtW7MD4EFnzvUjJ1ZQsDL8wuP8fnc=
k8s.io/apimachinery v0.29.5 h1:Hofa2BmPfpoT+IyDTlcPdCHSnHtEQMoJYGVoQpRTfv4=
k8s.io/apimachinery v0.29.5/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y=
k8s.io/apiserver v0.29.5 h1:223C+JkRnGmudEU00GfpX6quDSrzwwP0DuXOYTyUYb0=
k8s.io/apiserver v0.29.5/go.mod h1:zN9xdatz5g7XwL1Xoz9hD4QQON1GN0c+1kV5e/NHejM=
k8s.io/cli-runtime v0.29.5 h1:gnDrFEA4Xr8lAdc5U4tVfU7RGAmM/yvVvW9f0ao7g2s=
k8s.io/cli-runtime v0.29.5/go.mod h1:6KuWJyLIpbh2II874fA1SnmGHvZCitsHRR1XDowsMC0=
k8s.io/client-go v0.29.5 h1:nlASXmPQy190qTteaVP31g3c/wi2kycznkTP7Sv1zPc=
k8s.io/client-go v0.29.5/go.mod h1:aY5CnqUUvXYccJhm47XHoPcRyX6vouHdIBHaKZGTbK4=
k8s.io/cloud-provider v0.29.5 h1:xzgnKrXK8NgMVBGCAZmupzA5WALLTTQkGgg36k/Zey4=
k8s.io/cloud-provider v0.29.5/go.mod h1:cKT9OzdMUK2/2rF3dWOD/w6Oqg/X4MTxrNVv4GTappQ=
k8s.io/component-base v0.29.5 h1:Ptj8AzG+p8c2a839XriHwxakDpZH9uvIgYz+o1agjg8=
k8s.io/component-base v0.29.5/go.mod h1:9nBUoPxW/yimISIgAG7sJDrUGJlu7t8HnDafIrOdU8Q=
k8s.io/component-helpers v0.29.5 h1:aDwzJoQWK4zreZPKun6H2c3QIwy1F1G5hMU5YR1s8yA=
k8s.io/component-helpers v0.29.5/go.mod h1:5Hwtbhs8I9DdVvV8Lh2cKaHbGuqgqqE18iO5XyFzGVE=
k8s.io/controller-manager v0.29.5 h1:KOzas+Az8egEsTIajKdjVmlY0MzvAaYDREmo7+Kyyzg=
k8s.io/controller-manager v0.29.5/go.mod h1:WXsnVH7yjXG6jyjEQ/B0DTe71m1tC+TohTjt6/9RErs=
k8s.io/cri-api v0.29.5 h1:0gw14xvI1c4CZUX4zERaozgtdmnKb2xAV2FEbLh9Lxo=
k8s.io/cri-api v0.29.5/go.mod h1:A6pdbjzML2xi9B0Clqn5qt1HJ3Ik12x2j+jv/TkqjRE=
k8s.io/api v0.29.6 h1:eDxIl8+PeEpwbe2YyS5RXJ9vdn4hnKWMBf4WUJP9DQM=
k8s.io/api v0.29.6/go.mod h1:ZuUPMhJV74DJXapldbg6upaHfiOjrBb+0ffUbBi1jaw=
k8s.io/apiextensions-apiserver v0.29.6 h1:tUu1N6Zt9GT8KVcPF5aGDqfISz1mveM4yFh7eL5bxmE=
k8s.io/apiextensions-apiserver v0.29.6/go.mod h1:iw1EbwZat08I219qrQKoFMHGo7J9KxPqMpVKxCbNbCs=
k8s.io/apimachinery v0.29.6 h1:CLjJ5b0hWW7531n/njRE3rnusw3rhVGCFftPfnG54CI=
k8s.io/apimachinery v0.29.6/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y=
k8s.io/apiserver v0.29.6 h1:JxgDbpgahOgqoDOf+zVl2mI+rQcHcLQnK6YhhtsjbNs=
k8s.io/apiserver v0.29.6/go.mod h1:HrQwfPWxhwEa+n8/+5YwSF5yT2WXbeyFjqq6KEXHTX8=
k8s.io/cli-runtime v0.29.6 h1:nPbmS6ICW223S0BWTV+sK5xClWe89QB/n16/c5cJwT8=
k8s.io/cli-runtime v0.29.6/go.mod h1:5BzzwnVhtqVJvatDZmSZ6OtiSGqbdn0hKzpRbV3uf5o=
k8s.io/client-go v0.29.6 h1:5E2ebuB/p0F0THuQatyvhDvPL2SIeqwTPrtnrwKob/8=
k8s.io/client-go v0.29.6/go.mod h1:jHZcrQqDplyv20v7eu+iFM4gTpglZSZoMVcKrh8sRGg=
k8s.io/cloud-provider v0.29.6 h1:W6dafBlIRQlv8oDkK5UmuM0ZGw1lDCReh+BYtTBsBSI=
k8s.io/cloud-provider v0.29.6/go.mod h1:+bjtIdnbIW+Ubs5xbnWvYURymR3tcrmxWPgQp4lwoN0=
k8s.io/component-base v0.29.6 h1:XkVJI67FvBgNb/3kKqvaGKokxUrIR0RrksCPNI+JYCs=
k8s.io/component-base v0.29.6/go.mod h1:kIahZm8aw9lV8Vw17LF89REmeBrv5+QEl3v7HsrmITY=
k8s.io/component-helpers v0.29.6 h1:kG/tK0gXPXj6n3Oxn5Eul8nYzer3SejZI3ClwiWkreQ=
k8s.io/component-helpers v0.29.6/go.mod h1:Ltb44cbXci9fy9rytWwYsu8vHfi4fjyQdSwk6UlCR4E=
k8s.io/controller-manager v0.29.6 h1:bcn/i+8HncLlCbg1ccQxgn9PQ3YDeomDcwGF11a/Svo=
k8s.io/controller-manager v0.29.6/go.mod h1:LJr7QA1iBNXnoiNb0+oGJv1jHlXcc+cxon5DG2KxzKQ=
k8s.io/cri-api v0.29.6 h1:95kqUc2TzkxOiRBI9tSA+HY6JA/Zyg5jx6u541oJY9k=
k8s.io/cri-api v0.29.6/go.mod h1:A6pdbjzML2xi9B0Clqn5qt1HJ3Ik12x2j+jv/TkqjRE=
k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
k8s.io/kms v0.29.5 h1:DcR0hBeEcuLmKTpriezu7kyR4sJcHeeYle/WGdQWi2o=
k8s.io/kms v0.29.5/go.mod h1:vWVImKkJd+1BQY4tBwdfSwjQBiLrnbNtHADcDEDQFtk=
k8s.io/kube-aggregator v0.29.5 h1:+ko7OE8HoXjPPxcQTXbo1ctkymYIohI/E0dYDnFM1vU=
k8s.io/kube-aggregator v0.29.5/go.mod h1:4MPs9uKrm5VgxXsoaSU0QJbgIuxvNCnVTYlCVz7VWzY=
k8s.io/kms v0.29.6 h1:Aa+4zZDqUaFacjNGzCHIC0ilqnEhA1qHqvyn9igirPQ=
k8s.io/kms v0.29.6/go.mod h1:vWVImKkJd+1BQY4tBwdfSwjQBiLrnbNtHADcDEDQFtk=
k8s.io/kube-aggregator v0.29.6 h1:jZJjYF58F6kVuGC/kqLfuu7qGHqc2hoVKsDnRj26QRs=
k8s.io/kube-aggregator v0.29.6/go.mod h1:a6z0yORlXVXtGfsVB5PCjh2Soq1S7Wc6fApU6/T2eCE=
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780=
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
k8s.io/kubectl v0.29.5 h1:Y41B5AhRKMfDVKgFkS5vHKX43aHVch6+QIszCborERc=
k8s.io/kubectl v0.29.5/go.mod h1:/bxZpurdrKZFz/sa7jlLy1S8IxSiWhJCoA+DhLp7/T4=
k8s.io/kubelet v0.29.5 h1:tYYyc2JcrDt8jFYTsKpgcIpp+S5a/nm85CY4liosprw=
k8s.io/kubelet v0.29.5/go.mod h1:eWJR0OtRRkLwKEYjsQXcTyTZlSfgR3Py1xJVFa0ISTk=
k8s.io/kubernetes v1.29.5 h1:G+i73mlMcmqRge1STYospiN8X9FYHGeBOer/e2uGJ1k=
k8s.io/kubernetes v1.29.5/go.mod h1:28sDhcb87LX5z3GWAKYmLrhrifxi4W9bEWua4DRTIvk=
k8s.io/metrics v0.29.5 h1:5AZBM4pMiq+SHi2/RP1OuL90In3f07BrL610zunKoxA=
k8s.io/metrics v0.29.5/go.mod h1:Cx7JPEEbjdDpEQ2A1QyXSBd6z5bxlwaSf9rgFJ/adfQ=
k8s.io/mount-utils v0.29.5 h1:sY11J+CgXTzC2yWBjv7h+qOPykhMPRgichPCNFThMwk=
k8s.io/mount-utils v0.29.5/go.mod h1:SHUMR9n3b6tLgEmlyT36cL6fV6Sjwa5CJhc0guCXvb0=
k8s.io/kubectl v0.29.6 h1:hmkOMyH2uSUV16gIB3Qp2dv09fM2+PGEXz5SH1gwp7Y=
k8s.io/kubectl v0.29.6/go.mod h1:IUpyXy2OCbIMuBMAisDHM9shh5/Nseij4w+HIt0aq6A=
k8s.io/kubelet v0.29.6 h1:jXnnBNHK/KNNEJesmlIZmCvlYC3a5/e04BIS9VPM49M=
k8s.io/kubelet v0.29.6/go.mod h1:kGEUqodVM120YTTQLSCTXzZP4XMFDp7qLf7iU3hrRE4=
k8s.io/kubernetes v1.29.6 h1:jn8kA/oVOAWZOeoorx6xZ4d+KgGp+Evgi90x9bEI/DE=
k8s.io/kubernetes v1.29.6/go.mod h1:28sDhcb87LX5z3GWAKYmLrhrifxi4W9bEWua4DRTIvk=
k8s.io/metrics v0.29.6 h1:kjMGPYxtCi4OO0fUar76y0CiUoeGYDNmUV0LXJIis4Q=
k8s.io/metrics v0.29.6/go.mod h1:vqGzOaYGuNSSAI7GM1+v6L5z8aAUSzui1W0eQB3wVJY=
k8s.io/mount-utils v0.29.6 h1:44NDngKV5z/vt9YsYFVT0mPD68XjSfbqYfBEvUSwKb0=
k8s.io/mount-utils v0.29.6/go.mod h1:SHUMR9n3b6tLgEmlyT36cL6fV6Sjwa5CJhc0guCXvb0=
k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
oras.land/oras-go v1.2.4 h1:djpBY2/2Cs1PV87GSJlxv4voajVOMZxqqtq9AB8YNvY=
Expand Down
4 changes: 2 additions & 2 deletions hack/tool/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ require (
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/apimachinery v0.29.5 // indirect
k8s.io/client-go v0.29.5 // indirect
k8s.io/apimachinery v0.29.6 // indirect
k8s.io/client-go v0.29.6 // indirect
k8s.io/klog/v2 v2.110.1 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
Expand Down
12 changes: 6 additions & 6 deletions hack/tool/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -338,12 +338,12 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
gopkg.in/yaml.v3 v3.0.0/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.29.5 h1:levS+umUigHCfI3riD36pMY1vQEbrzh4r1ivVWAhHaI=
k8s.io/api v0.29.5/go.mod h1:7b18TtPcJzdjk7w5zWyIHgoAtpGeRvGGASxlS7UZXdQ=
k8s.io/apimachinery v0.29.5 h1:Hofa2BmPfpoT+IyDTlcPdCHSnHtEQMoJYGVoQpRTfv4=
k8s.io/apimachinery v0.29.5/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y=
k8s.io/client-go v0.29.5 h1:nlASXmPQy190qTteaVP31g3c/wi2kycznkTP7Sv1zPc=
k8s.io/client-go v0.29.5/go.mod h1:aY5CnqUUvXYccJhm47XHoPcRyX6vouHdIBHaKZGTbK4=
k8s.io/api v0.29.6 h1:eDxIl8+PeEpwbe2YyS5RXJ9vdn4hnKWMBf4WUJP9DQM=
k8s.io/api v0.29.6/go.mod h1:ZuUPMhJV74DJXapldbg6upaHfiOjrBb+0ffUbBi1jaw=
k8s.io/apimachinery v0.29.6 h1:CLjJ5b0hWW7531n/njRE3rnusw3rhVGCFftPfnG54CI=
k8s.io/apimachinery v0.29.6/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y=
k8s.io/client-go v0.29.6 h1:5E2ebuB/p0F0THuQatyvhDvPL2SIeqwTPrtnrwKob/8=
k8s.io/client-go v0.29.6/go.mod h1:jHZcrQqDplyv20v7eu+iFM4gTpglZSZoMVcKrh8sRGg=
k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780=
Expand Down
12 changes: 6 additions & 6 deletions inttest/sonobuoy/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ spec:
user: "ubuntu"
uploadBinary: true
k0s:
version: "1.29.5+k0s.0"
version: "1.29.6+k0s.0"
```
To deploy a k0s cluster on the AWS machine, run:
Expand Down Expand Up @@ -98,9 +98,9 @@ INFO ==> Running phase: Gather host facts
.
.
.
INFO [ssh] 3.250.52.147:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.29.5+k0s.0
INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.29.5+k0s.0
INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.29.5+k0s.0
INFO [ssh] 3.250.52.147:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.29.6+k0s.0
INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.29.6+k0s.0
INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.29.6+k0s.0
INFO ==> Running phase: Configure k0s
WARN [ssh] 63.32.21.232:22: generating default configuration
INFO [ssh] 63.32.21.232:22: validating configuration
Expand All @@ -124,7 +124,7 @@ INFO [ssh] 3.250.52.147:22: waiting for node to become ready
INFO ==> Running phase: Release exclusive host lock
INFO ==> Running phase: Disconnect from hosts
INFO ==> Finished in 1m42s
INFO k0s cluster version v1.29.5+k0s.0 is now installed
INFO k0s cluster version v1.29.6+k0s.0 is now installed
INFO Tip: To access the cluster you can now fetch the admin kubeconfig using:
INFO k0sctl kubeconfig
```
Expand Down Expand Up @@ -152,7 +152,7 @@ Example Output:
/home/ubuntu/k0s/inttest/bin/sonobuoy run --wait=1200 \
--mode=certified-conformance \
--plugin-env=e2e.E2E_EXTRA_ARGS="--ginkgo.v" \
--kubernetes-version=v1.29.5
--kubernetes-version=v1.29.6
INFO[0000] create request issued name=sonobuoy namespace= resource=namespaces
INFO[0000] create request issued name=sonobuoy-serviceaccount namespace=sonobuoy resource=serviceaccounts
INFO[0000] create request issued name=sonobuoy-serviceaccount-sonobuoy namespace= resource=clusterrolebindings
Expand Down
2 changes: 1 addition & 1 deletion inttest/update-server/html/unstable/index.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: unstable
version: v1.29.5+k0s.0
version: v1.29.6+k0s.0
downloadURLs:
k0s:
linux-amd64: ..../k0s-amd64
Expand Down
4 changes: 2 additions & 2 deletions pkg/apis/k0s/v1beta1/kubeproxy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ type KubeProxy struct {
}

// KubeProxyIPTablesConfiguration contains iptables-related kube-proxy configuration
// @see https://github.com/kubernetes/kube-proxy/blob/v0.29.5/config/v1alpha1/types.go#L27-L48
// @see https://github.com/kubernetes/kube-proxy/blob/v0.29.6/config/v1alpha1/types.go#L27-L48
type KubeProxyIPTablesConfiguration struct {
MasqueradeBit *int32 `json:"masqueradeBit,omitempty"`
MasqueradeAll bool `json:"masqueradeAll,omitempty"`
Expand All @@ -51,7 +51,7 @@ type KubeProxyIPTablesConfiguration struct {
}

// KubeProxyIPVSConfiguration contains ipvs-related kube-proxy configuration
// @see https://github.com/kubernetes/kube-proxy/blob/v0.29.5/config/v1alpha1/types.go#L52-L78
// @see https://github.com/kubernetes/kube-proxy/blob/v0.29.6/config/v1alpha1/types.go#L52-L78
type KubeProxyIPVSConfiguration struct {
SyncPeriod metav1.Duration `json:"syncPeriod,omitempty"`
MinSyncPeriod metav1.Duration `json:"minSyncPeriod,omitempty"`
Expand Down
2 changes: 1 addition & 1 deletion pkg/constant/constant_shared.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ const (
MetricsImage = "registry.k8s.io/metrics-server/metrics-server"
MetricsImageVersion = "v0.6.4"
KubeProxyImage = "quay.io/k0sproject/kube-proxy"
KubeProxyImageVersion = "v1.29.5"
KubeProxyImageVersion = "v1.29.6-1"
CoreDNSImage = "quay.io/k0sproject/coredns"
CoreDNSImageVersion = "1.11.3"
EnvoyProxyImage = "quay.io/k0sproject/envoy-distroless"
Expand Down
4 changes: 2 additions & 2 deletions static/manifests/v1beta1/CustomResourceDefinition/k0s.k0sproject.io_clusterconfigs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ spec:
iptables:
description: |-
KubeProxyIPTablesConfiguration contains iptables-related kube-proxy configuration
@see https://github.com/kubernetes/kube-proxy/blob/v0.29.5/config/v1alpha1/types.go#L27-L48
@see https://github.com/kubernetes/kube-proxy/blob/v0.29.6/config/v1alpha1/types.go#L27-L48
properties:
localhostNodePorts:
type: boolean
Expand All @@ -398,7 +398,7 @@ spec:
ipvs:
description: |-
KubeProxyIPVSConfiguration contains ipvs-related kube-proxy configuration
@see https://github.com/kubernetes/kube-proxy/blob/v0.29.5/config/v1alpha1/types.go#L52-L78
@see https://github.com/kubernetes/kube-proxy/blob/v0.29.6/config/v1alpha1/types.go#L52-L78
properties:
excludeCIDRs:
items:
Expand Down

0 comments on commit 20a0acd

Please sign in to comment.