From 9ddb19ec17d494bf7bcc53ce6ab13ec7148660ec Mon Sep 17 00:00:00 2001 From: Tom Wieczorek Date: Thu, 5 Dec 2024 14:45:23 +0100 Subject: [PATCH] Bump Kubernetes to v1.29.11 https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.29.md#changelog-since-v12910 Signed-off-by: Tom Wieczorek --- .github/workflows/publish-docs-manual.yml | 2 +- embedded-bins/Makefile.variables | 2 +- examples/bootloose-ha-controllers/Dockerfile | 2 +- go.mod | 98 +++++++++---------- go.sum | 72 +++++++------- hack/tool/go.mod | 4 +- hack/tool/go.sum | 12 +-- inttest/sonobuoy/README.md | 12 +-- .../update-server/html/unstable/index.yaml | 2 +- pkg/apis/k0s/v1beta1/kubeproxy.go | 4 +- pkg/constant/constant_shared.go | 2 +- .../k0s.k0sproject.io_clusterconfigs.yaml | 4 +- 12 files changed, 108 insertions(+), 108 deletions(-) diff --git a/.github/workflows/publish-docs-manual.yml b/.github/workflows/publish-docs-manual.yml index 247062c0b3ae..cf8cfacf87d4 100644 --- a/.github/workflows/publish-docs-manual.yml +++ b/.github/workflows/publish-docs-manual.yml @@ -3,7 +3,7 @@ on: workflow_dispatch: inputs: version: - description: 'Version tag (e.g."v1.29.10+k0s.0")' + description: 'Version tag (e.g."v1.29.11+k0s.0")' required: true env: diff --git a/embedded-bins/Makefile.variables b/embedded-bins/Makefile.variables index b817649ca03a..cc6069da3df4 100644 --- a/embedded-bins/Makefile.variables +++ b/embedded-bins/Makefile.variables @@ -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.10 +kubernetes_version = 1.29.11 helm_version = 3.11.1 kubernetes_buildimage = $(golang_buildimage) kubernetes_build_go_tags = "providerless" diff --git a/examples/bootloose-ha-controllers/Dockerfile b/examples/bootloose-ha-controllers/Dockerfile index 1d3b6c657ed4..9959f225d275 100644 --- a/examples/bootloose-ha-controllers/Dockerfile +++ b/examples/bootloose-ha-controllers/Dockerfile @@ -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.10/bin/linux/amd64/kubectl && \ +RUN curl -L -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.29.11/bin/linux/amd64/kubectl && \ chmod +x /usr/local/bin/kubectl ENV KUBECONFIG=/var/lib/k0s/pki/admin.conf diff --git a/go.mod b/go.mod index a69ccffc6eee..2f3e2772e074 100644 --- a/go.mod +++ b/go.mod @@ -66,20 +66,20 @@ require ( // Kubernetes require ( - k8s.io/api v0.29.10 - k8s.io/apiextensions-apiserver v0.29.10 - k8s.io/apimachinery v0.29.10 - k8s.io/cli-runtime v0.29.10 - k8s.io/client-go v0.29.10 - k8s.io/cloud-provider v0.29.10 - k8s.io/component-base v0.29.10 - k8s.io/component-helpers v0.29.10 - k8s.io/cri-api v0.29.10 - k8s.io/kube-aggregator v0.29.10 - k8s.io/kubectl v0.29.10 - k8s.io/kubelet v0.29.10 - k8s.io/kubernetes v1.29.10 - k8s.io/mount-utils v0.29.10 + k8s.io/api v0.29.11 + k8s.io/apiextensions-apiserver v0.29.11 + k8s.io/apimachinery v0.29.11 + k8s.io/cli-runtime v0.29.11 + k8s.io/client-go v0.29.11 + k8s.io/cloud-provider v0.29.11 + k8s.io/component-base v0.29.11 + k8s.io/component-helpers v0.29.11 + k8s.io/cri-api v0.29.11 + k8s.io/kube-aggregator v0.29.11 + k8s.io/kubectl v0.29.11 + k8s.io/kubelet v0.29.11 + k8s.io/kubernetes v1.29.11 + k8s.io/mount-utils v0.29.11 k8s.io/utils v0.0.0-20230726121419-3b25d923346b sigs.k8s.io/controller-runtime v0.17.0 sigs.k8s.io/yaml v1.4.0 @@ -276,12 +276,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.10 // indirect - k8s.io/controller-manager v0.29.10 // indirect + k8s.io/apiserver v0.29.11 // indirect + k8s.io/controller-manager v0.29.11 // indirect k8s.io/klog/v2 v2.110.1 // indirect - k8s.io/kms v0.29.10 // indirect + k8s.io/kms v0.29.11 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect - k8s.io/metrics v0.29.10 // indirect + k8s.io/metrics v0.29.11 // 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 @@ -293,35 +293,35 @@ require ( // Replacements duplicated from upstream Kubernetes replace ( - // https://github.com/kubernetes/kubernetes/blob/v1.29.10/go.mod#L251-L282 - k8s.io/api => k8s.io/api v0.29.10 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.10 - k8s.io/apimachinery => k8s.io/apimachinery v0.29.10 - k8s.io/apiserver => k8s.io/apiserver v0.29.10 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.10 - k8s.io/client-go => k8s.io/client-go v0.29.10 - k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.10 - k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.10 - k8s.io/code-generator => k8s.io/code-generator v0.29.10 - k8s.io/component-base => k8s.io/component-base v0.29.10 - k8s.io/component-helpers => k8s.io/component-helpers v0.29.10 - k8s.io/controller-manager => k8s.io/controller-manager v0.29.10 - k8s.io/cri-api => k8s.io/cri-api v0.29.10 - k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.10 - k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.10 - k8s.io/endpointslice => k8s.io/endpointslice v0.29.10 - k8s.io/kms => k8s.io/kms v0.29.10 - k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.10 - k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.10 - k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.10 - k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.10 - k8s.io/kubectl => k8s.io/kubectl v0.29.10 - k8s.io/kubelet => k8s.io/kubelet v0.29.10 - k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.10 - k8s.io/metrics => k8s.io/metrics v0.29.10 - k8s.io/mount-utils => k8s.io/mount-utils v0.29.10 - k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.10 - k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.10 - k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.29.10 - k8s.io/sample-controller => k8s.io/sample-controller v0.29.10 + // https://github.com/kubernetes/kubernetes/blob/v1.29.11/go.mod#L251-L282 + k8s.io/api => k8s.io/api v0.29.11 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.11 + k8s.io/apimachinery => k8s.io/apimachinery v0.29.11 + k8s.io/apiserver => k8s.io/apiserver v0.29.11 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.11 + k8s.io/client-go => k8s.io/client-go v0.29.11 + k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.11 + k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.11 + k8s.io/code-generator => k8s.io/code-generator v0.29.11 + k8s.io/component-base => k8s.io/component-base v0.29.11 + k8s.io/component-helpers => k8s.io/component-helpers v0.29.11 + k8s.io/controller-manager => k8s.io/controller-manager v0.29.11 + k8s.io/cri-api => k8s.io/cri-api v0.29.11 + k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.11 + k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.11 + k8s.io/endpointslice => k8s.io/endpointslice v0.29.11 + k8s.io/kms => k8s.io/kms v0.29.11 + k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.11 + k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.11 + k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.11 + k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.11 + k8s.io/kubectl => k8s.io/kubectl v0.29.11 + k8s.io/kubelet => k8s.io/kubelet v0.29.11 + k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.11 + k8s.io/metrics => k8s.io/metrics v0.29.11 + k8s.io/mount-utils => k8s.io/mount-utils v0.29.11 + k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.11 + k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.11 + k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.29.11 + k8s.io/sample-controller => k8s.io/sample-controller v0.29.11 ) diff --git a/go.sum b/go.sum index b7c45a9a89b5..e21e8c3cc879 100644 --- a/go.sum +++ b/go.sum @@ -922,46 +922,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.10 h1:Fao3HOxccbGRC1HZtXD+Y41xJhP0tEToVo5W7EEUBm0= -k8s.io/api v0.29.10/go.mod h1:rF0sRh64w1hMNAVGh4YYniSxODyHye3GLmymAbWBDvY= -k8s.io/apiextensions-apiserver v0.29.10 h1:2k2AHrWgs4S+07HrOjEdcyrQ/UqYlvBi6uon1fox1KE= -k8s.io/apiextensions-apiserver v0.29.10/go.mod h1:3rrJC52bW5frHf10N3JvaDpl++hgrzD9Gs6IZpKWMoc= -k8s.io/apimachinery v0.29.10 h1:57OLNqOJUgp5KlRRY3JOBFOTTa5Rt/LVkmKiiN2cvaQ= -k8s.io/apimachinery v0.29.10/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y= -k8s.io/apiserver v0.29.10 h1:dQwLNBG0qcNVbw72poZ3R+mvdi3RdtEX9x1nZX3RxGs= -k8s.io/apiserver v0.29.10/go.mod h1:UkJz90cVDZF/iZ19FEUEMWHI04EgoQiakMGD0x9urDY= -k8s.io/cli-runtime v0.29.10 h1:iX8bo6jmxvmoq046YX/Ry+s3Vc21sfxmYzjKLfEaP6M= -k8s.io/cli-runtime v0.29.10/go.mod h1:sGE4CX6FM600SEX8h/tPS0WGFYkTH+W5oU9eyp5Xtpc= -k8s.io/client-go v0.29.10 h1:hPmG1pmKslRhmCIzVd90sA58B0sJwNwduNgXFWsFqhI= -k8s.io/client-go v0.29.10/go.mod h1:gnMCQiRXGL9K0VtlW8gTkhzptGrHm2BJ4qBbujNemc4= -k8s.io/cloud-provider v0.29.10 h1:rAXSf6uaHWGiMle1eNL35uM/h4eLqzseUvn81rW47FI= -k8s.io/cloud-provider v0.29.10/go.mod h1:vbYmPvv+uBLEWaMdfdE1k3KFbGNKHvPFa+CZlfzKBHI= -k8s.io/component-base v0.29.10 h1:YQrQ/bpzGPGqIPEPaBzxjH0/1DJOI+yZPZNbbz7ZCBY= -k8s.io/component-base v0.29.10/go.mod h1:IbwsBob2DnYiAONsSHIuYenchqcDycbHSLHrXshuLgM= -k8s.io/component-helpers v0.29.10 h1:ND2o9OElB42N4bt77REMiiOdNQ1P6RJc/jIXgyPjfJw= -k8s.io/component-helpers v0.29.10/go.mod h1:erz34qUpzyNInTRehZaNqxYStgDcEh2ojpQcV+pLX9c= -k8s.io/controller-manager v0.29.10 h1:jTnEWQy+hGhBEVKZwzkz0hU9siELxrJqqtlQZ6fNJrg= -k8s.io/controller-manager v0.29.10/go.mod h1:GqaaXz9gOCs2etFklP9CNHsWDw6/UvyKqduFEQq8cRk= -k8s.io/cri-api v0.29.10 h1:V4j8CqdHDF8/ygFIswJd3c/13fKQxKVyGGkSc6Rpe1c= -k8s.io/cri-api v0.29.10/go.mod h1:A6pdbjzML2xi9B0Clqn5qt1HJ3Ik12x2j+jv/TkqjRE= +k8s.io/api v0.29.11 h1:6FwDo33f1WX5Yu0RQTX9YAd3wth8Ik0B4SXQKsoQfbk= +k8s.io/api v0.29.11/go.mod h1:3TDAW1OpFbz/Yx5r0W06b6eiAfHEwtH61VYDzpTU4Ng= +k8s.io/apiextensions-apiserver v0.29.11 h1:ytJJQ8EK0GzPa80tnPkfDoBGoNPMwqfaSWwg4FKmbEU= +k8s.io/apiextensions-apiserver v0.29.11/go.mod h1:eqKsza/nErdFNltXoVZmRt9vX99ooDLDMTcIcOG0ueg= +k8s.io/apimachinery v0.29.11 h1:55+6ue9advpA7T0sX2ZJDHCLKuiFfrAAR/39VQN9KEQ= +k8s.io/apimachinery v0.29.11/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y= +k8s.io/apiserver v0.29.11 h1:EXcv4/3iIKWG5tWI2ywdMY86jpxYw6WDAdMrBKUMkSc= +k8s.io/apiserver v0.29.11/go.mod h1:lnoWXh0J75ei1h4/F5ZbOEd7byiAVasherLB6Snzl/I= +k8s.io/cli-runtime v0.29.11 h1:NSVtRjAGU2IKcoEhOclOCk3p+biRQDWlBm8T4pGyRXY= +k8s.io/cli-runtime v0.29.11/go.mod h1:pEQ3MTwNg3FOD2K4KWK913gCP24TnPc/7pv7+mzkaJo= +k8s.io/client-go v0.29.11 h1:mBX7Ub0uqpLMwWz3J/AGS/xKOZsjr349qZ1vxVoL1l8= +k8s.io/client-go v0.29.11/go.mod h1:WOEoi/eLg2YEg3/yEd7YK3CNScYkM8AEScQadxUnaTE= +k8s.io/cloud-provider v0.29.11 h1:TrpRhwL1zJupJDi9mXRxUNvqkHm03U7RoQpFA7SLwc4= +k8s.io/cloud-provider v0.29.11/go.mod h1:MTGplcJnpST/nGFbhb5zGhdI23wGjEEaEi9G+17qgPk= +k8s.io/component-base v0.29.11 h1:H3GJIyDNPrscvXGP6wx+9gApcwwmrUd0YtCGp5BcHBA= +k8s.io/component-base v0.29.11/go.mod h1:0qu1WStER4wu5o8RMRndZUWPVcPH1XBy/QQiDcD6lew= +k8s.io/component-helpers v0.29.11 h1:GdZaSLBLlCa+EzjAnpZ4fGB75rA3qqPLLZKk+CsqNyo= +k8s.io/component-helpers v0.29.11/go.mod h1:gloyih9IiE4Qy/7iLUXqAmxYSUduuIpMCiNYuHfYvD4= +k8s.io/controller-manager v0.29.11 h1:gJkqYKh56fKnZz6lYXByPdMvxYynBukePXm1vpMsVLg= +k8s.io/controller-manager v0.29.11/go.mod h1:K45e2ADRO3o4RD5LaefDS/h/VwwG6uJkTa3mEiChe/4= +k8s.io/cri-api v0.29.11 h1:w3d5hhpc1zMDWOGvpSsPUnhoi0fo0avHUquNr1dB3aE= +k8s.io/cri-api v0.29.11/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.10 h1:LAck4rZrOIjLrSE1yhMLJM8H91QkfpWzCQyeTxdHKSk= -k8s.io/kms v0.29.10/go.mod h1:vWVImKkJd+1BQY4tBwdfSwjQBiLrnbNtHADcDEDQFtk= -k8s.io/kube-aggregator v0.29.10 h1:BP0i2k+QkXDq+MJXOjAQ7UoFErElN64indkJdZ2M8xg= -k8s.io/kube-aggregator v0.29.10/go.mod h1:2/fpQ2Ro5bLlx0SGvNEMXxb6DwP+h43mhtY8zQkrPxs= +k8s.io/kms v0.29.11 h1:pylaiDJhgfqczvcjMDPI89+VH0OVoGQhscPH1VbBzQE= +k8s.io/kms v0.29.11/go.mod h1:vWVImKkJd+1BQY4tBwdfSwjQBiLrnbNtHADcDEDQFtk= +k8s.io/kube-aggregator v0.29.11 h1:AOTak2T3LoQlsjNmYXuQOkHXIYdjt96SLPJiz9ScHwM= +k8s.io/kube-aggregator v0.29.11/go.mod h1:eoWn6TFvu9suE+ald9dEpuCNbQ6h9+h4px9iODiv3Ic= 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.10 h1:9LLAI52kRG98Kicn+JUPY3ZVg8MPcJVsHPoaMM//9cA= -k8s.io/kubectl v0.29.10/go.mod h1:HxsflBafbaRcMyQjiD6elLHr+erlGmnQgLzSDYjEth0= -k8s.io/kubelet v0.29.10 h1:QXtGDKUcpyYaBUUzrS+SahRcDE6J1U9JOxFhWbghP0w= -k8s.io/kubelet v0.29.10/go.mod h1:m2N6EtD5QmVCUmFIOL0l8LYOlcH+iZkQglmulqYg1dk= -k8s.io/kubernetes v1.29.10 h1:vlze77k0CbdevTbgliyxpSjfI3bvOUhPEJVSJAEUl5Q= -k8s.io/kubernetes v1.29.10/go.mod h1:L6/pfKQZ6Tv2O8gyT4OxhGZp+nNsjV54xtNodRoup9k= -k8s.io/metrics v0.29.10 h1:1HrqU+FzD2PaVpgDOmrEqX31t7KtZB5TAlPrsJLgH6I= -k8s.io/metrics v0.29.10/go.mod h1:N+6qNL56EeuhyuTj29iClimxtaFDg1wAMcCte1nVFL4= -k8s.io/mount-utils v0.29.10 h1:zzFHsi6//I6kmFNng6E2fXOW/TFdyoBVFO8IEgpsdb8= -k8s.io/mount-utils v0.29.10/go.mod h1:SHUMR9n3b6tLgEmlyT36cL6fV6Sjwa5CJhc0guCXvb0= +k8s.io/kubectl v0.29.11 h1:rxflwYQ1kmeEUVPWNevKLTtWjNfLrFSzLRZJoPolguU= +k8s.io/kubectl v0.29.11/go.mod h1:b6IhZyA/zp7q6kbiYfm5B3xwVPodVUvpfN6VG0LwA30= +k8s.io/kubelet v0.29.11 h1:V06Kr+CO5m6t4fdK+ZUfGBGB+9n5EE4DyMVflaRV34Q= +k8s.io/kubelet v0.29.11/go.mod h1:PCUTi0GGtVmewNoFeUiM5IGv3BKSNcuFogaMxiKEWmg= +k8s.io/kubernetes v1.29.11 h1:8JR33gU38Zq1FS7GvOOxDEgwR+OfjI5umSitd7aAqak= +k8s.io/kubernetes v1.29.11/go.mod h1:L6/pfKQZ6Tv2O8gyT4OxhGZp+nNsjV54xtNodRoup9k= +k8s.io/metrics v0.29.11 h1:GtIYoM6uKUQIygnUpVEYE4X12xggwWmnYe443TZumcg= +k8s.io/metrics v0.29.11/go.mod h1:aroO9WuHjPwp4Z6ACFG7aCZf3m8Un+Vn3ogauOlJHrE= +k8s.io/mount-utils v0.29.11 h1:8CG16bFCo7uhHj1HrQAzGCUzdVrLiWdZKQAxAUDMteQ= +k8s.io/mount-utils v0.29.11/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= diff --git a/hack/tool/go.mod b/hack/tool/go.mod index db5998d05326..3bf1a28aefb5 100644 --- a/hack/tool/go.mod +++ b/hack/tool/go.mod @@ -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.10 // indirect - k8s.io/client-go v0.29.10 // indirect + k8s.io/apimachinery v0.29.11 // indirect + k8s.io/client-go v0.29.11 // 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 diff --git a/hack/tool/go.sum b/hack/tool/go.sum index b1f60f1e47df..6861a1dca35a 100644 --- a/hack/tool/go.sum +++ b/hack/tool/go.sum @@ -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.10 h1:Fao3HOxccbGRC1HZtXD+Y41xJhP0tEToVo5W7EEUBm0= -k8s.io/api v0.29.10/go.mod h1:rF0sRh64w1hMNAVGh4YYniSxODyHye3GLmymAbWBDvY= -k8s.io/apimachinery v0.29.10 h1:57OLNqOJUgp5KlRRY3JOBFOTTa5Rt/LVkmKiiN2cvaQ= -k8s.io/apimachinery v0.29.10/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y= -k8s.io/client-go v0.29.10 h1:hPmG1pmKslRhmCIzVd90sA58B0sJwNwduNgXFWsFqhI= -k8s.io/client-go v0.29.10/go.mod h1:gnMCQiRXGL9K0VtlW8gTkhzptGrHm2BJ4qBbujNemc4= +k8s.io/api v0.29.11 h1:6FwDo33f1WX5Yu0RQTX9YAd3wth8Ik0B4SXQKsoQfbk= +k8s.io/api v0.29.11/go.mod h1:3TDAW1OpFbz/Yx5r0W06b6eiAfHEwtH61VYDzpTU4Ng= +k8s.io/apimachinery v0.29.11 h1:55+6ue9advpA7T0sX2ZJDHCLKuiFfrAAR/39VQN9KEQ= +k8s.io/apimachinery v0.29.11/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y= +k8s.io/client-go v0.29.11 h1:mBX7Ub0uqpLMwWz3J/AGS/xKOZsjr349qZ1vxVoL1l8= +k8s.io/client-go v0.29.11/go.mod h1:WOEoi/eLg2YEg3/yEd7YK3CNScYkM8AEScQadxUnaTE= 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= diff --git a/inttest/sonobuoy/README.md b/inttest/sonobuoy/README.md index 7441f1f4619e..98c7d0743f1a 100644 --- a/inttest/sonobuoy/README.md +++ b/inttest/sonobuoy/README.md @@ -61,7 +61,7 @@ spec: user: "ubuntu" uploadBinary: true k0s: - version: "1.29.10+k0s.0" + version: "1.29.11+k0s.0" ``` To deploy a k0s cluster on the AWS machine, run: @@ -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.10+k0s.0 -INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.29.10+k0s.0 -INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.29.10+k0s.0 +INFO [ssh] 3.250.52.147:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.29.11+k0s.0 +INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.29.11+k0s.0 +INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.29.11+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 @@ -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.10+k0s.0 is now installed +INFO k0s cluster version v1.29.11+k0s.0 is now installed INFO Tip: To access the cluster you can now fetch the admin kubeconfig using: INFO k0sctl kubeconfig ``` @@ -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.10 + --kubernetes-version=v1.29.11 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 diff --git a/inttest/update-server/html/unstable/index.yaml b/inttest/update-server/html/unstable/index.yaml index fef82d7cc8fa..5e07c58171bf 100644 --- a/inttest/update-server/html/unstable/index.yaml +++ b/inttest/update-server/html/unstable/index.yaml @@ -1,5 +1,5 @@ name: unstable -version: v1.29.10+k0s.0 +version: v1.29.11+k0s.0 downloadURLs: k0s: linux-amd64: ..../k0s-amd64 diff --git a/pkg/apis/k0s/v1beta1/kubeproxy.go b/pkg/apis/k0s/v1beta1/kubeproxy.go index e0203b37777e..72f7e08aa0a2 100644 --- a/pkg/apis/k0s/v1beta1/kubeproxy.go +++ b/pkg/apis/k0s/v1beta1/kubeproxy.go @@ -41,7 +41,7 @@ type KubeProxy struct { } // KubeProxyIPTablesConfiguration contains iptables-related kube-proxy configuration -// @see https://github.com/kubernetes/kube-proxy/blob/v0.29.10/config/v1alpha1/types.go#L27-L48 +// @see https://github.com/kubernetes/kube-proxy/blob/v0.29.11/config/v1alpha1/types.go#L27-L48 type KubeProxyIPTablesConfiguration struct { MasqueradeBit *int32 `json:"masqueradeBit,omitempty"` MasqueradeAll bool `json:"masqueradeAll,omitempty"` @@ -51,7 +51,7 @@ type KubeProxyIPTablesConfiguration struct { } // KubeProxyIPVSConfiguration contains ipvs-related kube-proxy configuration -// @see https://github.com/kubernetes/kube-proxy/blob/v0.29.10/config/v1alpha1/types.go#L52-L78 +// @see https://github.com/kubernetes/kube-proxy/blob/v0.29.11/config/v1alpha1/types.go#L52-L78 type KubeProxyIPVSConfiguration struct { SyncPeriod metav1.Duration `json:"syncPeriod,omitempty"` MinSyncPeriod metav1.Duration `json:"minSyncPeriod,omitempty"` diff --git a/pkg/constant/constant_shared.go b/pkg/constant/constant_shared.go index dcdda44d5178..72277127fd86 100644 --- a/pkg/constant/constant_shared.go +++ b/pkg/constant/constant_shared.go @@ -78,7 +78,7 @@ const ( MetricsImage = "registry.k8s.io/metrics-server/metrics-server" MetricsImageVersion = "v0.7.2" KubeProxyImage = "quay.io/k0sproject/kube-proxy" - KubeProxyImageVersion = "v1.29.10" + KubeProxyImageVersion = "v1.29.11" CoreDNSImage = "quay.io/k0sproject/coredns" CoreDNSImageVersion = "1.11.4" EnvoyProxyImage = "quay.io/k0sproject/envoy-distroless" diff --git a/static/manifests/v1beta1/CustomResourceDefinition/k0s.k0sproject.io_clusterconfigs.yaml b/static/manifests/v1beta1/CustomResourceDefinition/k0s.k0sproject.io_clusterconfigs.yaml index 3f3589e5d16a..6b9c3dab5d3d 100644 --- a/static/manifests/v1beta1/CustomResourceDefinition/k0s.k0sproject.io_clusterconfigs.yaml +++ b/static/manifests/v1beta1/CustomResourceDefinition/k0s.k0sproject.io_clusterconfigs.yaml @@ -398,7 +398,7 @@ spec: iptables: description: |- KubeProxyIPTablesConfiguration contains iptables-related kube-proxy configuration - @see https://github.com/kubernetes/kube-proxy/blob/v0.29.10/config/v1alpha1/types.go#L27-L48 + @see https://github.com/kubernetes/kube-proxy/blob/v0.29.11/config/v1alpha1/types.go#L27-L48 properties: localhostNodePorts: type: boolean @@ -415,7 +415,7 @@ spec: ipvs: description: |- KubeProxyIPVSConfiguration contains ipvs-related kube-proxy configuration - @see https://github.com/kubernetes/kube-proxy/blob/v0.29.10/config/v1alpha1/types.go#L52-L78 + @see https://github.com/kubernetes/kube-proxy/blob/v0.29.11/config/v1alpha1/types.go#L52-L78 properties: excludeCIDRs: items: