From 91ce1beaeb328d606d83a6abb3e993060d9bdb9f Mon Sep 17 00:00:00 2001 From: Tom Wieczorek Date: Thu, 16 Nov 2023 10:18:05 +0100 Subject: [PATCH] Bump Kubernetes to v1.27.8 Fixes CVE-2023-5528. Signed-off-by: Tom Wieczorek --- docs/autopilot.md | 2 +- embedded-bins/Makefile.variables | 2 +- examples/footloose-ha-controllers/Dockerfile | 2 +- go.mod | 96 +++++++++---------- go.sum | 72 +++++++------- hack/tool/go.mod | 12 +-- hack/tool/go.sum | 28 +++--- inttest/conformance/README.md | 6 +- inttest/sonobuoy/README.md | 12 +-- .../update-server/html/unstable/index.yaml | 2 +- pkg/constant/constant_shared.go | 2 +- 11 files changed, 118 insertions(+), 118 deletions(-) diff --git a/docs/autopilot.md b/docs/autopilot.md index 3214c2c2ff50..fecb2bf33308 100644 --- a/docs/autopilot.md +++ b/docs/autopilot.md @@ -99,7 +99,7 @@ spec: version: v{{{ extra.k8s_version }}}+k0s.0 platforms: linux-amd64: - url: https://github.com/k0sproject/k0s/releases/download/v1.27.7+k0s.0/k0s-v1.27.7+k0s.0-amd64 + url: https://github.com/k0sproject/k0s/releases/download/v1.27.8+k0s.0/k0s-v1.27.8+k0s.0-amd64 sha256: '0000000000000000000000000000000000000000000000000000000000000000' targets: controllers: diff --git a/embedded-bins/Makefile.variables b/embedded-bins/Makefile.variables index f0f711fe7533..2a0609ab4922 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.7 +kubernetes_version = 1.27.8 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 49dd797f934b..de46ab46f307 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.7/bin/linux/amd64/kubectl && \ +RUN curl -L -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.27.8/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 1e6315feebae..9b3e20b3a088 100644 --- a/go.mod +++ b/go.mod @@ -63,20 +63,20 @@ require ( // Kubernetes require ( - k8s.io/api v0.27.7 - k8s.io/apiextensions-apiserver v0.27.7 - k8s.io/apimachinery v0.27.7 - k8s.io/cli-runtime v0.27.7 - k8s.io/client-go v0.27.7 - k8s.io/cloud-provider v0.27.7 - k8s.io/component-base v0.27.7 - k8s.io/component-helpers v0.27.7 - k8s.io/cri-api v0.27.7 - k8s.io/kube-aggregator v0.27.7 - k8s.io/kubectl v0.27.7 - k8s.io/kubelet v0.27.7 - k8s.io/kubernetes v1.27.7 - k8s.io/mount-utils v0.27.7 + k8s.io/api v0.27.8 + k8s.io/apiextensions-apiserver v0.27.8 + k8s.io/apimachinery v0.27.8 + k8s.io/cli-runtime v0.27.8 + k8s.io/client-go v0.27.8 + k8s.io/cloud-provider v0.27.8 + k8s.io/component-base v0.27.8 + k8s.io/component-helpers v0.27.8 + k8s.io/cri-api v0.27.8 + k8s.io/kube-aggregator v0.27.8 + k8s.io/kubectl v0.27.8 + k8s.io/kubelet v0.27.8 + k8s.io/kubernetes v1.27.8 + k8s.io/mount-utils v0.27.8 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.7 // indirect - k8s.io/controller-manager v0.27.7 // indirect + k8s.io/apiserver v0.27.8 // indirect + k8s.io/controller-manager v0.27.8 // indirect k8s.io/klog/v2 v2.90.1 // indirect - k8s.io/kms v0.27.7 // indirect + k8s.io/kms v0.27.8 // indirect k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect - k8s.io/metrics v0.27.7 // indirect + k8s.io/metrics v0.27.8 // 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.7/go.mod#L245-L275 - k8s.io/api => k8s.io/api v0.27.7 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.7 - k8s.io/apimachinery => k8s.io/apimachinery v0.27.7 - k8s.io/apiserver => k8s.io/apiserver v0.27.7 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.7 - k8s.io/client-go => k8s.io/client-go v0.27.7 - k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.7 - k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.7 - k8s.io/code-generator => k8s.io/code-generator v0.27.7 - k8s.io/component-base => k8s.io/component-base v0.27.7 - k8s.io/component-helpers => k8s.io/component-helpers v0.27.7 - k8s.io/controller-manager => k8s.io/controller-manager v0.27.7 - k8s.io/cri-api => k8s.io/cri-api v0.27.7 - k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.7 - k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.27.7 - k8s.io/kms => k8s.io/kms v0.27.7 - k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.7 - k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.7 - k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.7 - k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.7 - k8s.io/kubectl => k8s.io/kubectl v0.27.7 - k8s.io/kubelet => k8s.io/kubelet v0.27.7 - k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.7 - k8s.io/metrics => k8s.io/metrics v0.27.7 - k8s.io/mount-utils => k8s.io/mount-utils v0.27.7 - k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.7 - k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.7 - k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.27.7 - k8s.io/sample-controller => k8s.io/sample-controller v0.27.7 + // https://github.com/kubernetes/kubernetes/blob/v1.27.8/go.mod#L249-L279 + k8s.io/api => k8s.io/api v0.27.8 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.8 + k8s.io/apimachinery => k8s.io/apimachinery v0.27.8 + k8s.io/apiserver => k8s.io/apiserver v0.27.8 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.8 + k8s.io/client-go => k8s.io/client-go v0.27.8 + k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.8 + k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.8 + k8s.io/code-generator => k8s.io/code-generator v0.27.8 + k8s.io/component-base => k8s.io/component-base v0.27.8 + k8s.io/component-helpers => k8s.io/component-helpers v0.27.8 + k8s.io/controller-manager => k8s.io/controller-manager v0.27.8 + k8s.io/cri-api => k8s.io/cri-api v0.27.8 + k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.8 + k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.27.8 + k8s.io/kms => k8s.io/kms v0.27.8 + k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.8 + k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.8 + k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.8 + k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.8 + k8s.io/kubectl => k8s.io/kubectl v0.27.8 + k8s.io/kubelet => k8s.io/kubelet v0.27.8 + k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.8 + k8s.io/metrics => k8s.io/metrics v0.27.8 + k8s.io/mount-utils => k8s.io/mount-utils v0.27.8 + k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.8 + k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.8 + k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.27.8 + k8s.io/sample-controller => k8s.io/sample-controller v0.27.8 ) diff --git a/go.sum b/go.sum index 86ef62f63cc0..b037fbf4d8d6 100644 --- a/go.sum +++ b/go.sum @@ -1442,46 +1442,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.7 h1:7yG4D3t/q4utJe2ptlRw9aPuxcSmroTsYxsofkQNl/A= -k8s.io/api v0.27.7/go.mod h1:ZNExI/Lhrs9YrLgVWx6jjHZdoWCTXfBXuFjt1X6olro= -k8s.io/apiextensions-apiserver v0.27.7 h1:YqIOwZAUokzxJIjunmUd4zS1v3JhK34EPXn+pP0/bsU= -k8s.io/apiextensions-apiserver v0.27.7/go.mod h1:x0p+b5a955lfPz9gaDeBy43obM12s+N9dNHK6+dUL+g= -k8s.io/apimachinery v0.27.7 h1:Gxgtb7Y/Rsu8ymgmUEaiErkxa6RY4oTd8kNUI6SUR58= -k8s.io/apimachinery v0.27.7/go.mod h1:jBGQgTjkw99ef6q5hv1YurDd3BqKDk9YRxmX0Ozo0i8= -k8s.io/apiserver v0.27.7 h1:E8sDHwfUug82YC1++qvE73QxihaXDqT4tr8XYBOEtc4= -k8s.io/apiserver v0.27.7/go.mod h1:OrLG9RwCOerutAlo8QJW5EHzUG9Dad7k6rgcDUNSO/w= -k8s.io/cli-runtime v0.27.7 h1:YaRoPlR9QwCXQXlSQYIJ0qbbAkonQsdP3RoKt1T7RHI= -k8s.io/cli-runtime v0.27.7/go.mod h1:oE7qtmIiKEcrkMYGYQjmFaAZgR20zsIXH0nCjMpZFKk= -k8s.io/client-go v0.27.7 h1:+Xgh9OOKv6A3qdD4Dnl/0VOI5EvAv+0s/OseDxVVTwQ= -k8s.io/client-go v0.27.7/go.mod h1:dZ2kqcalYp5YZ2EV12XIMc77G6PxHWOJp/kclZr4+5Q= -k8s.io/cloud-provider v0.27.7 h1:tKn1bQVt3j95skBKaPO5dwBxmr39/SqdsCw3yNqcXws= -k8s.io/cloud-provider v0.27.7/go.mod h1:FI1QOdb/hnbrc+jEx+efrwDn/QyqMd3CfoOrm1bVmxs= -k8s.io/component-base v0.27.7 h1:kngM58HR9W9Nqpv7e4rpdRyWnKl/ABpUhLAZ+HoliMs= -k8s.io/component-base v0.27.7/go.mod h1:YGjlCVL1oeKvG3HSciyPHFh+LCjIEqsxz4BDR3cfHRs= -k8s.io/component-helpers v0.27.7 h1:4oJkgJuvrwUpuTLvJjoENUv8HO/Bb0VnyhQXFByU+Hg= -k8s.io/component-helpers v0.27.7/go.mod h1:L9Kzzc7amjdzPP7aipEWjkLakBolXkrEGb7Enl8geGs= -k8s.io/controller-manager v0.27.7 h1:ImTbPspuIL8mIWrF6g2BqEH7yNfqQ9kmfvBIqGjeWTw= -k8s.io/controller-manager v0.27.7/go.mod h1:R5pFgkLbAR0E48HAmjKBw6RIXh1PSfOH1kcPOJmmzhI= -k8s.io/cri-api v0.27.7 h1:S1cTY6YJaSSCZQBgOTE3SBP9HFUh6JpeGpWESvl17Wo= -k8s.io/cri-api v0.27.7/go.mod h1:bQZqXeujysY8v+acIefSJtx2pcHKz6CFSMdSfd1LsRc= +k8s.io/api v0.27.8 h1:Ja93gbyII5c3TJzWefEwGhlqC5SZksWhzRS+OYHIocU= +k8s.io/api v0.27.8/go.mod h1:2HuWJC6gpx4UScY+ezziNzv6j6Jqd2q0rGgobYSSjcs= +k8s.io/apiextensions-apiserver v0.27.8 h1:u9PON71euIhVbHdZ5YlznpY60GtRjPagf1mQXLo1siA= +k8s.io/apiextensions-apiserver v0.27.8/go.mod h1:qBlRJTKCA0gnFVCsjzbz3YJZ49TCBNEwvEF2TPMRqOs= +k8s.io/apimachinery v0.27.8 h1:Xg+ogjDm8s7KmV3vZGf7uOZ0jrC6FPy2Lk/h7BIRmvg= +k8s.io/apimachinery v0.27.8/go.mod h1:EIXLxLt/b1muPITiF5zlrcm7I+YnXsIgM+0GdnPTQvA= +k8s.io/apiserver v0.27.8 h1:fdrEm98wl1lxFoF8tCdQiYQOfmU3TOGkQr4YTLYHwzc= +k8s.io/apiserver v0.27.8/go.mod h1:8yLtDnOdRq9fubaea0zQ3AVheQUinb5Y/RqBUdQMT0Y= +k8s.io/cli-runtime v0.27.8 h1:ZaDL/cjiQL+Wy+Rli42YOIJUy0/RnFAN8MFgh+5MK7Y= +k8s.io/cli-runtime v0.27.8/go.mod h1:QSiR1aJwFj33pxLkd6wVzORDfLq8OFog53qHRW7KkWg= +k8s.io/client-go v0.27.8 h1:uXIsGniqc85kKQ8FV0iAwspb0JHtS1UybqrqzHaQ9hc= +k8s.io/client-go v0.27.8/go.mod h1:Ka6MUpObn3LRTfFPvjzyettp8LXCbhqLzZfi8TD4fP8= +k8s.io/cloud-provider v0.27.8 h1:juD0BcRWKW7WaNxO70EWAvsBrBlRa2/WjRQKY/vUlfw= +k8s.io/cloud-provider v0.27.8/go.mod h1:qtA+pX9uzrNiYxooBfE2QahsfcRaL3sH4QfgDyeaS2M= +k8s.io/component-base v0.27.8 h1:O8YRFv/wWvoo9z62p1N52lq+w5FpzILAlE1h8b9o3K8= +k8s.io/component-base v0.27.8/go.mod h1:h3uyZl+bFQeuLRz3owfSLaw3JKTrn6gmbvybkkW2z+I= +k8s.io/component-helpers v0.27.8 h1:w8Z+VFrhn/If48RHv2qtwJScHT6ifaLric0YZw2QxN8= +k8s.io/component-helpers v0.27.8/go.mod h1:AhGfmwrttufwWW+y7EfsbhEvCW6haVHgpMeuBChA0r8= +k8s.io/controller-manager v0.27.8 h1:GG6VhjOvgsiX3vOMT/clMlU1LeizP8s4rsHI//Szrww= +k8s.io/controller-manager v0.27.8/go.mod h1:Q5qtr4W1R3ovjnOH+W6IHx3qKumuWPtt7mIaazonubM= +k8s.io/cri-api v0.27.8 h1:ptTyisTm3Zte5GMKjYVJNFlFRsuXlLCXCMY++JMLp8Q= +k8s.io/cri-api v0.27.8/go.mod h1:/YDseKYD84iAVzkaYWA4BNU/aCZVsb+1D9CsbTJnZ+4= 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.7 h1:3iB92lQIH4uEz0V+wQAXvAsgIDhmXg/8lCu01FCjtqI= -k8s.io/kms v0.27.7/go.mod h1:JspOc8g6+cDlZfgW5GqnHS+OV6tAVyg4iXytCrqfNPw= -k8s.io/kube-aggregator v0.27.7 h1:aCGRbMrRhBtcbwyB/bstmEt/aZMKL+tMBns4rh7g6K0= -k8s.io/kube-aggregator v0.27.7/go.mod h1:j0il03rPuDJsdlADAG3kyo00wWRHsfuGhZ8+T9STqHE= +k8s.io/kms v0.27.8 h1:D7s2vZAFWKD1+1Yg6Y4C+l7k+ZjEsMc7BjY0QRKAOY8= +k8s.io/kms v0.27.8/go.mod h1:+yIM/3y+UgdaZSQaMJObNONp0i237t/dVrxswECh7a0= +k8s.io/kube-aggregator v0.27.8 h1:BgAxJByvinQ4C041xhPpiIwZF7LQqMBvKzCdllAiZ8I= +k8s.io/kube-aggregator v0.27.8/go.mod h1:FOc8GF4BDVFJ69QpUNSMmrfLbaouQNdu1xW+Fqm/VTE= 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.7 h1:HTEDa4s/oWjB3t5ysdW1yKlcNl9bzigcqWBq0LIIe3k= -k8s.io/kubectl v0.27.7/go.mod h1:Xb1Ubc8uN1i2RvSN1HCgSHTtzgX0woihMk/gW7XbjJU= -k8s.io/kubelet v0.27.7 h1:DiptBLFbl6nyadTP9DUfhiReasBDV1qyE1r8h2o5mXc= -k8s.io/kubelet v0.27.7/go.mod h1:WKoEgiCa6/hzmgN4UgVioEwcpLC8wg+9Xzzc8fqOCYs= -k8s.io/kubernetes v1.27.7 h1:YXzCNZ289k8cy5pOOGzGqBUjCF9eLVqwwImEIX+uB4I= -k8s.io/kubernetes v1.27.7/go.mod h1:9RuASG1ooCxhMDOxMG5nJ0Vw/wap9iylq4Y/Uzn/R/0= -k8s.io/metrics v0.27.7 h1:QxbdyeVY1rVvezrn1pBJI6PGlDZv02mvw2MAMSU/sMo= -k8s.io/metrics v0.27.7/go.mod h1:Di2ydObW4Sq6N9r/3A8BalBsNBqFmYuDeBhTkxnSkhs= -k8s.io/mount-utils v0.27.7 h1:UvbRo2nPaB8sQyr+tdDDS5A/MChzhwlG0vO2iGw6TdI= -k8s.io/mount-utils v0.27.7/go.mod h1:xhPO8oPBui6ReCKsJQ+p6me6vhwrBPVb5Ib/8Xkap40= +k8s.io/kubectl v0.27.8 h1:VipG0f9E1kGRGJYm2/kNv188RgDduvx1g2q1b20niHg= +k8s.io/kubectl v0.27.8/go.mod h1:ZufZqfI5V7oBuGFALJHoTxypO0fewOwbadr4saUkRKo= +k8s.io/kubelet v0.27.8 h1:U6+jInyVkQbVky1MofSc2bDPHu7V4oZFRzv/g34hWEc= +k8s.io/kubelet v0.27.8/go.mod h1:fCkdJ8bPZTsVwVKIyYAy0hMCOIxdgS0MeqcT5xBBup8= +k8s.io/kubernetes v1.27.8 h1:K848lTo/D0jvrxUlTvw4nNADixbhXLHgKNDP/KlFGy8= +k8s.io/kubernetes v1.27.8/go.mod h1:PUXXrx0IhAi+kI9BMDqNJHUnLndVv9W0DkriqyjuJOs= +k8s.io/metrics v0.27.8 h1:rKzd/Wkd6YbI9lY33rJK2Zn/U6jHkLoNndKCLqPIKco= +k8s.io/metrics v0.27.8/go.mod h1:TnV3Bb8Vew0VmSlhanKzP97Mtwx6LcE2/i6p3O1C5Rw= +k8s.io/mount-utils v0.27.8 h1:BfzSou4epo21IFKanDx7JmVOVK62xg4PdV328YsHr34= +k8s.io/mount-utils v0.27.8/go.mod h1:xhPO8oPBui6ReCKsJQ+p6me6vhwrBPVb5Ib/8Xkap40= 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 50554e7c2db2..c4a10ca847cf 100644 --- a/hack/tool/go.mod +++ b/hack/tool/go.mod @@ -78,20 +78,20 @@ require ( github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect github.com/zclconf/go-cty v1.13.0 // indirect golang.org/x/crypto v0.14.0 // indirect - golang.org/x/mod v0.9.0 // indirect + golang.org/x/mod v0.12.0 // indirect golang.org/x/net v0.17.0 // indirect - golang.org/x/oauth2 v0.4.0 // indirect + golang.org/x/oauth2 v0.7.0 // indirect golang.org/x/sys v0.13.0 // indirect golang.org/x/term v0.13.0 // indirect golang.org/x/text v0.13.0 // indirect golang.org/x/time v0.3.0 // indirect - golang.org/x/tools v0.7.0 // indirect + golang.org/x/tools v0.12.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/protobuf v1.28.1 // indirect + google.golang.org/protobuf v1.31.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - k8s.io/apimachinery v0.27.7 // indirect - k8s.io/client-go v0.27.7 // indirect + k8s.io/apimachinery v0.27.8 // indirect + k8s.io/client-go v0.27.8 // 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 0821036480d2..45abdd92d1fa 100644 --- a/hack/tool/go.sum +++ b/hack/tool/go.sum @@ -302,8 +302,8 @@ golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvx golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs= -golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -328,15 +328,15 @@ golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.4.0 h1:NF0gk8LVPg1Ml7SSbGyySuoxdsXitj7TvgvuRxIMc/M= -golang.org/x/oauth2 v0.4.0/go.mod h1:RznEsdpjGAINPTOF0UH/t+xJ75L18YO3Ho6Pyn+uRec= +golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g= +golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= +golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -378,8 +378,8 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4= -golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s= +golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss= +golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -413,8 +413,8 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= -google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -437,11 +437,11 @@ 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.7 h1:7yG4D3t/q4utJe2ptlRw9aPuxcSmroTsYxsofkQNl/A= -k8s.io/apimachinery v0.27.7 h1:Gxgtb7Y/Rsu8ymgmUEaiErkxa6RY4oTd8kNUI6SUR58= -k8s.io/apimachinery v0.27.7/go.mod h1:jBGQgTjkw99ef6q5hv1YurDd3BqKDk9YRxmX0Ozo0i8= -k8s.io/client-go v0.27.7 h1:+Xgh9OOKv6A3qdD4Dnl/0VOI5EvAv+0s/OseDxVVTwQ= -k8s.io/client-go v0.27.7/go.mod h1:dZ2kqcalYp5YZ2EV12XIMc77G6PxHWOJp/kclZr4+5Q= +k8s.io/api v0.27.8 h1:Ja93gbyII5c3TJzWefEwGhlqC5SZksWhzRS+OYHIocU= +k8s.io/apimachinery v0.27.8 h1:Xg+ogjDm8s7KmV3vZGf7uOZ0jrC6FPy2Lk/h7BIRmvg= +k8s.io/apimachinery v0.27.8/go.mod h1:EIXLxLt/b1muPITiF5zlrcm7I+YnXsIgM+0GdnPTQvA= +k8s.io/client-go v0.27.8 h1:uXIsGniqc85kKQ8FV0iAwspb0JHtS1UybqrqzHaQ9hc= +k8s.io/client-go v0.27.8/go.mod h1:Ka6MUpObn3LRTfFPvjzyettp8LXCbhqLzZfi8TD4fP8= 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 276213f0cec9..babdaec9446d 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.7+k0s.0 -k8s_version=v1.27.7 +k0s_version=v1.27.8+k0s.0 +k8s_version=v1.27.8 sonobuoy_version=0.53.2 ``` ### 2. Environment variables ```shell -TF_VAR_k0s_version=v1.27.7+k0s.0 TF_VAR_sonobuoy_version=0.20.0 TF_VAR_k8s_version=v1.27.7 terraform apply +TF_VAR_k0s_version=v1.27.8+k0s.0 TF_VAR_sonobuoy_version=0.20.0 TF_VAR_k8s_version=v1.27.8 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 ea9c2ee7877c..cedbb47478ac 100644 --- a/inttest/sonobuoy/README.md +++ b/inttest/sonobuoy/README.md @@ -61,7 +61,7 @@ spec: user: "ubuntu" uploadBinary: true k0s: - version: "1.27.7+k0s.0" + version: "1.27.8+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.7+k0s.0 -INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.27.7+k0s.0 -INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.27.7+k0s.0 +INFO [ssh] 3.250.52.147:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.27.8+k0s.0 +INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.27.8+k0s.0 +INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.27.8+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.7+k0s.0 is now installed +INFO k0s cluster version v1.27.8+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.7 + --kubernetes-version=v1.27.8 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 a5a279cb2a31..ad979f57a81e 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.7+k0s.0 +version: v1.27.8+k0s.0 downloadURLs: k0s: linux-amd64: ..../k0s-amd64 diff --git a/pkg/constant/constant_shared.go b/pkg/constant/constant_shared.go index 8befcd422f29..23d56b7e2ad2 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.7" + KubeProxyImageVersion = "v1.27.8" CoreDNSImage = "quay.io/k0sproject/coredns" CoreDNSImageVersion = "1.10.1" EnvoyProxyImage = "quay.io/k0sproject/envoy-distroless"