From 1dad34311bab8e563caf3f48a4f2c662f418461c Mon Sep 17 00:00:00 2001 From: Tom Wieczorek Date: Wed, 24 Jul 2024 17:13:38 +0200 Subject: [PATCH] Bump Kubernetes to v1.27.16 https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.27.md#changelog-since-v12715 Fixes CVE-2024-5321. Signed-off-by: Tom Wieczorek --- .github/workflows/publish-docs-manual.yml | 2 +- embedded-bins/Makefile.variables | 2 +- examples/footloose-ha-controllers/Dockerfile | 2 +- go.mod | 96 +++++++++---------- go.sum | 72 +++++++------- hack/tool/go.mod | 4 +- hack/tool/go.sum | 12 +-- inttest/conformance/README.md | 6 +- inttest/sonobuoy/README.md | 12 +-- .../update-server/html/unstable/index.yaml | 2 +- .../k0s.k0sproject.io/v1beta1/kubeproxy.go | 4 +- pkg/constant/constant_shared.go | 2 +- .../k0s.k0sproject.io_clusterconfigs.yaml | 4 +- 13 files changed, 110 insertions(+), 110 deletions(-) diff --git a/.github/workflows/publish-docs-manual.yml b/.github/workflows/publish-docs-manual.yml index e2ee5a8c4692..4123d3fcd0c2 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.27.15+k0s.0")' + description: 'Version tag (e.g."v1.27.16+k0s.0")' required: true env: diff --git a/embedded-bins/Makefile.variables b/embedded-bins/Makefile.variables index bd0fa8c5c4de..b0992967c87e 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.27.15 +kubernetes_version = 1.27.16 helm_version = 3.11.1 kubernetes_buildimage = $(golang_buildimage) kubernetes_build_go_tags = "providerless" diff --git a/examples/footloose-ha-controllers/Dockerfile b/examples/footloose-ha-controllers/Dockerfile index 558bb0d79da3..59377cf98aa8 100644 --- a/examples/footloose-ha-controllers/Dockerfile +++ b/examples/footloose-ha-controllers/Dockerfile @@ -2,7 +2,7 @@ FROM quay.io/footloose/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.27.15/bin/linux/amd64/kubectl && \ +RUN curl -L -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.27.16/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 ab1cb6fad38b..9609c91b2ae1 100644 --- a/go.mod +++ b/go.mod @@ -63,20 +63,20 @@ require ( // Kubernetes require ( - k8s.io/api v0.27.15 - k8s.io/apiextensions-apiserver v0.27.15 - k8s.io/apimachinery v0.27.15 - k8s.io/cli-runtime v0.27.15 - k8s.io/client-go v0.27.15 - k8s.io/cloud-provider v0.27.15 - k8s.io/component-base v0.27.15 - k8s.io/component-helpers v0.27.15 - k8s.io/cri-api v0.27.15 - k8s.io/kube-aggregator v0.27.15 - k8s.io/kubectl v0.27.15 - k8s.io/kubelet v0.27.15 - k8s.io/kubernetes v1.27.15 - k8s.io/mount-utils v0.27.15 + k8s.io/api v0.27.16 + k8s.io/apiextensions-apiserver v0.27.16 + k8s.io/apimachinery v0.27.16 + k8s.io/cli-runtime v0.27.16 + k8s.io/client-go v0.27.16 + k8s.io/cloud-provider v0.27.16 + k8s.io/component-base v0.27.16 + k8s.io/component-helpers v0.27.16 + k8s.io/cri-api v0.27.16 + k8s.io/kube-aggregator v0.27.16 + k8s.io/kubectl v0.27.16 + k8s.io/kubelet v0.27.16 + k8s.io/kubernetes v1.27.16 + k8s.io/mount-utils v0.27.16 k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 sigs.k8s.io/controller-runtime v0.13.1-0.20230412185432-fbd6b944a634 // includes https://github.com/kubernetes-sigs/controller-runtime/pull/2223 sigs.k8s.io/yaml v1.3.0 @@ -271,12 +271,12 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/apiserver v0.27.15 // indirect - k8s.io/controller-manager v0.27.15 // indirect + k8s.io/apiserver v0.27.16 // indirect + k8s.io/controller-manager v0.27.16 // indirect k8s.io/klog/v2 v2.90.1 // indirect - k8s.io/kms v0.27.15 // indirect + k8s.io/kms v0.27.16 // indirect k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect - k8s.io/metrics v0.27.15 // indirect + k8s.io/metrics v0.27.16 // indirect oras.land/oras-go v1.2.4-0.20230505142456-f92397840738 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect @@ -308,34 +308,34 @@ replace ( // Replacements duplicated from upstream Kubernetes replace ( - // https://github.com/kubernetes/kubernetes/blob/v1.27.15/go.mod#L249-L279 - k8s.io/api => k8s.io/api v0.27.15 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.15 - k8s.io/apimachinery => k8s.io/apimachinery v0.27.15 - k8s.io/apiserver => k8s.io/apiserver v0.27.15 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.15 - k8s.io/client-go => k8s.io/client-go v0.27.15 - k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.15 - k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.15 - k8s.io/code-generator => k8s.io/code-generator v0.27.15 - k8s.io/component-base => k8s.io/component-base v0.27.15 - k8s.io/component-helpers => k8s.io/component-helpers v0.27.15 - k8s.io/controller-manager => k8s.io/controller-manager v0.27.15 - k8s.io/cri-api => k8s.io/cri-api v0.27.15 - k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.15 - k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.27.15 - k8s.io/kms => k8s.io/kms v0.27.15 - k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.15 - k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.15 - k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.15 - k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.15 - k8s.io/kubectl => k8s.io/kubectl v0.27.15 - k8s.io/kubelet => k8s.io/kubelet v0.27.15 - k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.15 - k8s.io/metrics => k8s.io/metrics v0.27.15 - k8s.io/mount-utils => k8s.io/mount-utils v0.27.15 - k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.15 - k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.15 - k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.27.15 - k8s.io/sample-controller => k8s.io/sample-controller v0.27.15 + // https://github.com/kubernetes/kubernetes/blob/v1.27.16/go.mod#L249-L279 + k8s.io/api => k8s.io/api v0.27.16 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.16 + k8s.io/apimachinery => k8s.io/apimachinery v0.27.16 + k8s.io/apiserver => k8s.io/apiserver v0.27.16 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.16 + k8s.io/client-go => k8s.io/client-go v0.27.16 + k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.16 + k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.16 + k8s.io/code-generator => k8s.io/code-generator v0.27.16 + k8s.io/component-base => k8s.io/component-base v0.27.16 + k8s.io/component-helpers => k8s.io/component-helpers v0.27.16 + k8s.io/controller-manager => k8s.io/controller-manager v0.27.16 + k8s.io/cri-api => k8s.io/cri-api v0.27.16 + k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.16 + k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.27.16 + k8s.io/kms => k8s.io/kms v0.27.16 + k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.16 + k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.16 + k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.16 + k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.16 + k8s.io/kubectl => k8s.io/kubectl v0.27.16 + k8s.io/kubelet => k8s.io/kubelet v0.27.16 + k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.16 + k8s.io/metrics => k8s.io/metrics v0.27.16 + k8s.io/mount-utils => k8s.io/mount-utils v0.27.16 + k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.16 + k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.16 + k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.27.16 + k8s.io/sample-controller => k8s.io/sample-controller v0.27.16 ) diff --git a/go.sum b/go.sum index 3e9d55797622..302d21c74d6a 100644 --- a/go.sum +++ b/go.sum @@ -1492,46 +1492,46 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.27.15 h1:+bR5ju3H+OjePA1DMEmHm33EzhtmqWBuQvqhTVYFXD0= -k8s.io/api v0.27.15/go.mod h1:x/uHpsq4NAAGMiHWhq3P5W1ABiw4/aUWpIeGq1XmegY= -k8s.io/apiextensions-apiserver v0.27.15 h1:7362lG3ieXff69Db5kJ709P8f5Rg3lPsyCEbl53bPQs= -k8s.io/apiextensions-apiserver v0.27.15/go.mod h1:HYIRJp0hRQNSBiOqN75FGA7A3/fI4Hqq7+9foX7wT8o= -k8s.io/apimachinery v0.27.15 h1:wT8HeVe/KNcX+QavW97ZpKiGxSN5glW39Dxvj/8wMPU= -k8s.io/apimachinery v0.27.15/go.mod h1:TWo+8wOIz3CytsrlI9k/LBWXLRr9dqf5hRSCbbggMAg= -k8s.io/apiserver v0.27.15 h1:EgyZVhJw53CpOfXaiwPM6tlkPNJgftSIaMZzKjLmBrg= -k8s.io/apiserver v0.27.15/go.mod h1:/67w8vVSEBTwd373IrdWgNZ37P2EcpQn3+BG33d80Fo= -k8s.io/cli-runtime v0.27.15 h1:UABMgpoRhBknZlNgr5aXn+wZxozdUsFRtmkHqRyQeKM= -k8s.io/cli-runtime v0.27.15/go.mod h1:3IYFYRl0Qkh4zi+oFT1IUfX/xMAUafy8117te5KSNjo= -k8s.io/client-go v0.27.15 h1:SDUs0ap/VuHPyoRiEChUhXQlh25UZAeXcm82J3TYy2w= -k8s.io/client-go v0.27.15/go.mod h1:/ULqZ7zjeuEm/fSf7A5kKmbWb2GY/CnCiquS5XzAdzo= -k8s.io/cloud-provider v0.27.15 h1:A3FPqRguEltPr2wWJgkROrnpOW7WxSRVxEmIiGjDuc0= -k8s.io/cloud-provider v0.27.15/go.mod h1:cRv5KQLS2mlPc2AmSs4qnII4uUGel6EsJJm8SAD3NNk= -k8s.io/component-base v0.27.15 h1:rGksMoF/awvLn+bcm4EMKpLk1Lzkvh4BlzL162q6gG0= -k8s.io/component-base v0.27.15/go.mod h1:46jXYR70vcRyypfWQf9lQSLrSoA3D7RuRb4WsmneEAo= -k8s.io/component-helpers v0.27.15 h1:iBf9Yi+PkQz/GUrdj68M8R0XI8cHg562c7pKhR80TsI= -k8s.io/component-helpers v0.27.15/go.mod h1:YAUfryduJYgNCAjzSiM0qDF4laRHp5ByuYl5bc3LjXM= -k8s.io/controller-manager v0.27.15 h1:0seCiDugxt5ldsEeBrR4Td3u7nwfJ+i9Jbygt6+LqeE= -k8s.io/controller-manager v0.27.15/go.mod h1:CsUumZ7pnugheyyS/3mMh4PHqOLEp93c86vxZ02sml4= -k8s.io/cri-api v0.27.15 h1:lbzjWx+42y4DXFXy4k9sfs7tT3OzzPW11txkX03TtRk= -k8s.io/cri-api v0.27.15/go.mod h1:l7yoWCx1cRtQ5HV+1Z53qvEH9BFlZatkjvN5dhsG5iY= +k8s.io/api v0.27.16 h1:70IBoTuiPfd+Tm68WH0tGXQRSQq0R1xnbyhTRe8WYQY= +k8s.io/api v0.27.16/go.mod h1:5j0Cgo6X4qovBOu3OjzRwETDEYqMxq2qafhDQXOPy3A= +k8s.io/apiextensions-apiserver v0.27.16 h1:gJ0sEbfYmvgdysC2WjkeYujvjmWAyPH6e8ANVAL5qxk= +k8s.io/apiextensions-apiserver v0.27.16/go.mod h1:wq5IgoFVjYyJqqcjD+R+/opZJxBQcu9PIcFWJ8eaQLQ= +k8s.io/apimachinery v0.27.16 h1:Nmbei3P/6w6vxbNxV8/sDCZz+TQrJ9A4+bVIRjDufuM= +k8s.io/apimachinery v0.27.16/go.mod h1:TWo+8wOIz3CytsrlI9k/LBWXLRr9dqf5hRSCbbggMAg= +k8s.io/apiserver v0.27.16 h1:s3+lMqISTj5l/ZH/BvhdbiMfIoTF3/lrAN99BHccLmk= +k8s.io/apiserver v0.27.16/go.mod h1:xwxM8/bcAtgkWqbsGwMQjImIC5Jik7a4pHRptEDqQf0= +k8s.io/cli-runtime v0.27.16 h1:8ICGnxcbgZKl2HThESIJ0mwbvFqAaOSdwVs8zKzrEcg= +k8s.io/cli-runtime v0.27.16/go.mod h1:48X5XSy536FjT30gE7GwXJPCbTk+ZtQMhEbZs/9bzGU= +k8s.io/client-go v0.27.16 h1:x06Jk6/SIQQ6kAsWs5uzQIkBLHtcAQlbTAgmj1tZzG0= +k8s.io/client-go v0.27.16/go.mod h1:bPZUNRj8XsHa+JVS5jU6qeU2H/Za8+7riWA08FUjaA8= +k8s.io/cloud-provider v0.27.16 h1:DPWnVrouMaBdwQJkMj7/cf3zyNsqPYEPXhRkQtZ3s9U= +k8s.io/cloud-provider v0.27.16/go.mod h1:XgbHhQ7Z+57xaRvxxVSq2tWC00cT1SO74mLBop8SOTk= +k8s.io/component-base v0.27.16 h1:CpPBD1GIwsaRdDF0WzJkIppakYJwQCvsKK8exRxe9rY= +k8s.io/component-base v0.27.16/go.mod h1:g636fljq9A7zsIB0nRE4fgmBCo8aqjoJe1aLkCX0Vwc= +k8s.io/component-helpers v0.27.16 h1:7ulLXd43EYGIN200/ARhNxhmGJJMNrkxtd7nZwqJuBM= +k8s.io/component-helpers v0.27.16/go.mod h1:zx8ypRCqOvRH/gB8aRCLqJWU98A3sYYMG2fU1d5/Qqg= +k8s.io/controller-manager v0.27.16 h1:3TbbII/lnKbOwk64uCD1uUJqAEYD1zuz9LAC8et76WQ= +k8s.io/controller-manager v0.27.16/go.mod h1:EQVxw6KP3WPV/0Y43ycsGwlzW6eH5hVprLyfwK8echc= +k8s.io/cri-api v0.27.16 h1:Yxh72+SeHhJngFMw+9H58jASvUzt0nTaMOS/t8M9Cbw= +k8s.io/cri-api v0.27.16/go.mod h1:l7yoWCx1cRtQ5HV+1Z53qvEH9BFlZatkjvN5dhsG5iY= k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw= k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kms v0.27.15 h1:U9PifyDQJWa3CEET+y87tOK/JCEXLRvv9+obqVhzagw= -k8s.io/kms v0.27.15/go.mod h1:PsFg4I/RVe9n8QyRUA+AkbiXBQhzuVpPQ7s/VFQTiCU= -k8s.io/kube-aggregator v0.27.15 h1:rNDpet0ByQ7ceRBimUuEKYvpiColarnCq0vF0ELqsPU= -k8s.io/kube-aggregator v0.27.15/go.mod h1:JcOCyjbCAY+zhfdmTx8RK7+v08y6LwhuzR5TC51kRKM= +k8s.io/kms v0.27.16 h1:Zso2+ixKQzz/N9b8q9MrFKHv2Fu7jb+0Zvu+iLWAUME= +k8s.io/kms v0.27.16/go.mod h1:BQf/ALdGhPhqoc1q81A7WdWpjrZ6jCSfePCNecz1AW8= +k8s.io/kube-aggregator v0.27.16 h1:UPq0RB75NNMN3UrEUzNMNDcAtpln6aHUez+KcLcQaPs= +k8s.io/kube-aggregator v0.27.16/go.mod h1:i1VDXxBS1jAYl77QeLm4gpEV4ZCubqurNsoSmc1Bygc= k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg= k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg= -k8s.io/kubectl v0.27.15 h1:/+SVRrlO8yGVLAwCBwL75DaQ6JozOsVyAEuv3rfWfRk= -k8s.io/kubectl v0.27.15/go.mod h1:pOi0BbATT95x4lfp3vdRhOjInhtYLMIWTKiw8SRsN2o= -k8s.io/kubelet v0.27.15 h1:8wEgRiglGeSmxL4hb1Ta6BZ5TpaTxJtWGUyu3wMRWzs= -k8s.io/kubelet v0.27.15/go.mod h1:+cBqAocyf5icgsxoDcuhawHP1mLQ8xb0ViW/zLGGmaQ= -k8s.io/kubernetes v1.27.15 h1:nTVHLXxUf9iCGAhO422+PNuyCFxmkTgFQIxUZDxzlwQ= -k8s.io/kubernetes v1.27.15/go.mod h1:T4toI2XSWG5FJoq/H8q9eFYPymAxe/k4UnaC00uPnMs= -k8s.io/metrics v0.27.15 h1:ok3O/08IXp6rOC404qCmOFFiKiK1wXYJSB4Dq3L8Opg= -k8s.io/metrics v0.27.15/go.mod h1:8FU/31I8DWMfqR4DN8sdZXbzCja8MU1c4zy/kvn4t9s= -k8s.io/mount-utils v0.27.15 h1:KOx1qhcrXEx6Otv5hpBnCq17zJsCPNfP3lfeKkZC3e8= -k8s.io/mount-utils v0.27.15/go.mod h1:bBE748kmEaM5B38hXaPJjlVeoAtHxHg/aizoiqm+6OI= +k8s.io/kubectl v0.27.16 h1:lcsr0VokO7UWbTKTZG1t5jPlWAT62/RPFBfGq7WPdsw= +k8s.io/kubectl v0.27.16/go.mod h1:2oG5aJh0qRtUazp5dU2ilDnRJtPUNhaiYP1mo4ot7xY= +k8s.io/kubelet v0.27.16 h1:ubei/gPi92hFYIc+lN8FNPifDzfZssrBl4M1yC64TgQ= +k8s.io/kubelet v0.27.16/go.mod h1:+aFHesx5Swb/I1KEkEaK235MGpaxNcIBxLWrxWiO6T4= +k8s.io/kubernetes v1.27.16 h1:DHFqj/HTUqHStFlRH9wCKPocqgHsjR6Q/DzYarB2QQE= +k8s.io/kubernetes v1.27.16/go.mod h1:T4toI2XSWG5FJoq/H8q9eFYPymAxe/k4UnaC00uPnMs= +k8s.io/metrics v0.27.16 h1:n9mZ1OV2A7qwgQyQkdZsinWnttZv4IDxqRLAovhwvUY= +k8s.io/metrics v0.27.16/go.mod h1:7WjdtT5LHByzueQa8AQrHt4Qttuehjk9RtL/+RTwnV0= +k8s.io/mount-utils v0.27.16 h1:pvt8J9jW1xlt7R9RM8SKwVo1ya994Kz9qADEmW6WcWg= +k8s.io/mount-utils v0.27.16/go.mod h1:bBE748kmEaM5B38hXaPJjlVeoAtHxHg/aizoiqm+6OI= k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 h1:kmDqav+P+/5e1i9tFfHq1qcF3sOrDp+YEkVDAHu7Jwk= k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= oras.land/oras-go v1.2.4-0.20230505142456-f92397840738 h1:Nb9UIOXWjmxhbZ/og27D3TpDytMvT/jKyNw9jho2BhI= diff --git a/hack/tool/go.mod b/hack/tool/go.mod index 7ace6dc2b097..4267f4c45a5b 100644 --- a/hack/tool/go.mod +++ b/hack/tool/go.mod @@ -90,8 +90,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.27.15 // indirect - k8s.io/client-go v0.27.15 // indirect + k8s.io/apimachinery v0.27.16 // indirect + k8s.io/client-go v0.27.16 // indirect k8s.io/klog/v2 v2.90.1 // indirect k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect diff --git a/hack/tool/go.sum b/hack/tool/go.sum index c8b2b90dbfba..c7f71d3a837b 100644 --- a/hack/tool/go.sum +++ b/hack/tool/go.sum @@ -460,12 +460,12 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= 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.27.15 h1:+bR5ju3H+OjePA1DMEmHm33EzhtmqWBuQvqhTVYFXD0= -k8s.io/api v0.27.15/go.mod h1:x/uHpsq4NAAGMiHWhq3P5W1ABiw4/aUWpIeGq1XmegY= -k8s.io/apimachinery v0.27.15 h1:wT8HeVe/KNcX+QavW97ZpKiGxSN5glW39Dxvj/8wMPU= -k8s.io/apimachinery v0.27.15/go.mod h1:TWo+8wOIz3CytsrlI9k/LBWXLRr9dqf5hRSCbbggMAg= -k8s.io/client-go v0.27.15 h1:SDUs0ap/VuHPyoRiEChUhXQlh25UZAeXcm82J3TYy2w= -k8s.io/client-go v0.27.15/go.mod h1:/ULqZ7zjeuEm/fSf7A5kKmbWb2GY/CnCiquS5XzAdzo= +k8s.io/api v0.27.16 h1:70IBoTuiPfd+Tm68WH0tGXQRSQq0R1xnbyhTRe8WYQY= +k8s.io/api v0.27.16/go.mod h1:5j0Cgo6X4qovBOu3OjzRwETDEYqMxq2qafhDQXOPy3A= +k8s.io/apimachinery v0.27.16 h1:Nmbei3P/6w6vxbNxV8/sDCZz+TQrJ9A4+bVIRjDufuM= +k8s.io/apimachinery v0.27.16/go.mod h1:TWo+8wOIz3CytsrlI9k/LBWXLRr9dqf5hRSCbbggMAg= +k8s.io/client-go v0.27.16 h1:x06Jk6/SIQQ6kAsWs5uzQIkBLHtcAQlbTAgmj1tZzG0= +k8s.io/client-go v0.27.16/go.mod h1:bPZUNRj8XsHa+JVS5jU6qeU2H/Za8+7riWA08FUjaA8= k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw= k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg= diff --git a/inttest/conformance/README.md b/inttest/conformance/README.md index 266ffaeb970a..de42a1f8ffa0 100644 --- a/inttest/conformance/README.md +++ b/inttest/conformance/README.md @@ -35,15 +35,15 @@ In order to run the conformance test, you will need to set the tested k0s versio In the same directory as your `main.tf` file, create an additional file `terraform.tfvars` with the following input: ```terraform -k0s_version=v1.27.15+k0s.0 -k8s_version=v1.27.15 +k0s_version=v1.27.16+k0s.0 +k8s_version=v1.27.16 sonobuoy_version=0.53.2 ``` ### 2. Environment variables ```shell -TF_VAR_k0s_version=v1.27.15+k0s.0 TF_VAR_sonobuoy_version=0.20.0 TF_VAR_k8s_version=v1.27.15 terraform apply +TF_VAR_k0s_version=v1.27.16+k0s.0 TF_VAR_sonobuoy_version=0.20.0 TF_VAR_k8s_version=v1.27.16 terraform apply ``` **NOTE:** By default, terraform will fetch sonobuoy version **0.53.2**. If you want to use a different version you can override this with one of the above methods. diff --git a/inttest/sonobuoy/README.md b/inttest/sonobuoy/README.md index 4949857aa691..631797a7c68e 100644 --- a/inttest/sonobuoy/README.md +++ b/inttest/sonobuoy/README.md @@ -61,7 +61,7 @@ spec: user: "ubuntu" uploadBinary: true k0s: - version: "1.27.15+k0s.0" + version: "1.27.16+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.27.15+k0s.0 -INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.27.15+k0s.0 -INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.27.15+k0s.0 +INFO [ssh] 3.250.52.147:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.27.16+k0s.0 +INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.27.16+k0s.0 +INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.27.16+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.27.15+k0s.0 is now installed +INFO k0s cluster version v1.27.16+k0s.0 is now installed INFO Tip: To access the cluster you can now fetch the admin kubeconfig using: INFO k0sctl kubeconfig ``` @@ -151,7 +151,7 @@ Example Output: ➜ make check-conformance /home/ubuntu/k0s/inttest/bin/sonobuoy run --wait=1200 \ --mode=certified-conformance \ - --kubernetes-version=v1.27.15 + --kubernetes-version=v1.27.16 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 35c17dfc5a42..dc63ab7ec1dc 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.27.15+k0s.0 +version: v1.27.16+k0s.0 downloadURLs: k0s: linux-amd64: ..../k0s-amd64 diff --git a/pkg/apis/k0s.k0sproject.io/v1beta1/kubeproxy.go b/pkg/apis/k0s.k0sproject.io/v1beta1/kubeproxy.go index a71ff34dc55d..1e66b224ddfe 100644 --- a/pkg/apis/k0s.k0sproject.io/v1beta1/kubeproxy.go +++ b/pkg/apis/k0s.k0sproject.io/v1beta1/kubeproxy.go @@ -40,7 +40,7 @@ type KubeProxy struct { } // KubeProxyIPTablesConfiguration contains iptables-related kube-proxy configuration -// @see https://github.com/kubernetes/kube-proxy/blob/v0.27.15/config/v1alpha1/types.go#L26-L41 +// @see https://github.com/kubernetes/kube-proxy/blob/v0.27.16/config/v1alpha1/types.go#L26-L41 type KubeProxyIPTablesConfiguration struct { MasqueradeBit *int32 `json:"masqueradeBit,omitempty"` MasqueradeAll bool `json:"masqueradeAll,omitempty"` @@ -50,7 +50,7 @@ type KubeProxyIPTablesConfiguration struct { } // KubeProxyIPVSConfiguration contains ipvs-related kube-proxy configuration -// @see https://github.com/kubernetes/kube-proxy/blob/v0.27.15/config/v1alpha1/types.go#L45-L69 +// @see https://github.com/kubernetes/kube-proxy/blob/v0.27.16/config/v1alpha1/types.go#L45-L69 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 c74209f15c34..2040198d063d 100644 --- a/pkg/constant/constant_shared.go +++ b/pkg/constant/constant_shared.go @@ -85,7 +85,7 @@ const ( MetricsImage = "registry.k8s.io/metrics-server/metrics-server" MetricsImageVersion = "v0.6.4" KubeProxyImage = "quay.io/k0sproject/kube-proxy" - KubeProxyImageVersion = "v1.27.15" + KubeProxyImageVersion = "v1.27.16" CoreDNSImage = "quay.io/k0sproject/coredns" CoreDNSImageVersion = "1.10.1" 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 05e571bad5e8..51f8811f06f0 100644 --- a/static/manifests/v1beta1/CustomResourceDefinition/k0s.k0sproject.io_clusterconfigs.yaml +++ b/static/manifests/v1beta1/CustomResourceDefinition/k0s.k0sproject.io_clusterconfigs.yaml @@ -387,7 +387,7 @@ spec: type: boolean iptables: description: KubeProxyIPTablesConfiguration contains iptables-related - kube-proxy configuration @see https://github.com/kubernetes/kube-proxy/blob/v0.27.15/config/v1alpha1/types.go#L26-L41 + kube-proxy configuration @see https://github.com/kubernetes/kube-proxy/blob/v0.27.16/config/v1alpha1/types.go#L26-L41 properties: localhostNodePorts: type: boolean @@ -403,7 +403,7 @@ spec: type: object ipvs: description: KubeProxyIPVSConfiguration contains ipvs-related - kube-proxy configuration @see https://github.com/kubernetes/kube-proxy/blob/v0.27.15/config/v1alpha1/types.go#L45-L69 + kube-proxy configuration @see https://github.com/kubernetes/kube-proxy/blob/v0.27.16/config/v1alpha1/types.go#L45-L69 properties: excludeCIDRs: items: