From 409623532f94654ab50e12f65cd39e81c5766638 Mon Sep 17 00:00:00 2001 From: Tom Wieczorek Date: Wed, 27 Mar 2024 16:19:41 +0100 Subject: [PATCH] Bump Kubernetes to v1.27.12 https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.27.md#changelog-since-v12711 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 | 100 +++++++++--------- go.sum | 80 +++++++------- hack/tool/go.mod | 8 +- hack/tool/go.sum | 20 ++-- 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/.github/workflows/publish-docs-manual.yml b/.github/workflows/publish-docs-manual.yml index 5729ca903a91..1ddb4851d6ce 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.11+k0s.0")' + description: 'Version tag (e.g."v1.27.12+k0s.0")' required: true env: diff --git a/embedded-bins/Makefile.variables b/embedded-bins/Makefile.variables index 1c1053c0ca9f..d6871776eb61 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.11 +kubernetes_version = 1.27.12 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 a9e5b0db6f82..849d3771c91b 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.11/bin/linux/amd64/kubectl && \ +RUN curl -L -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.27.12/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 02b35bbf6c3e..e3521ea43f34 100644 --- a/go.mod +++ b/go.mod @@ -63,20 +63,20 @@ require ( // Kubernetes require ( - k8s.io/api v0.27.11 - k8s.io/apiextensions-apiserver v0.27.11 - k8s.io/apimachinery v0.27.11 - k8s.io/cli-runtime v0.27.11 - k8s.io/client-go v0.27.11 - k8s.io/cloud-provider v0.27.11 - k8s.io/component-base v0.27.11 - k8s.io/component-helpers v0.27.11 - k8s.io/cri-api v0.27.11 - k8s.io/kube-aggregator v0.27.11 - k8s.io/kubectl v0.27.11 - k8s.io/kubelet v0.27.11 - k8s.io/kubernetes v1.27.11 - k8s.io/mount-utils v0.27.11 + k8s.io/api v0.27.12 + k8s.io/apiextensions-apiserver v0.27.12 + k8s.io/apimachinery v0.27.12 + k8s.io/cli-runtime v0.27.12 + k8s.io/client-go v0.27.12 + k8s.io/cloud-provider v0.27.12 + k8s.io/component-base v0.27.12 + k8s.io/component-helpers v0.27.12 + k8s.io/cri-api v0.27.12 + k8s.io/kube-aggregator v0.27.12 + k8s.io/kubectl v0.27.12 + k8s.io/kubelet v0.27.12 + k8s.io/kubernetes v1.27.12 + k8s.io/mount-utils v0.27.12 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 @@ -151,7 +151,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v4 v4.4.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/google/btree v1.1.2 // indirect github.com/google/cel-go v0.12.7 // indirect github.com/google/certificate-transparency-go v1.1.4 // indirect @@ -266,17 +266,17 @@ require ( google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect - google.golang.org/protobuf v1.31.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect 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.11 // indirect - k8s.io/controller-manager v0.27.11 // indirect + k8s.io/apiserver v0.27.12 // indirect + k8s.io/controller-manager v0.27.12 // indirect k8s.io/klog/v2 v2.90.1 // indirect - k8s.io/kms v0.27.11 // indirect + k8s.io/kms v0.27.12 // indirect k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect - k8s.io/metrics v0.27.11 // indirect + k8s.io/metrics v0.27.12 // 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.11/go.mod#L249-L279 - k8s.io/api => k8s.io/api v0.27.11 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.11 - k8s.io/apimachinery => k8s.io/apimachinery v0.27.11 - k8s.io/apiserver => k8s.io/apiserver v0.27.11 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.11 - k8s.io/client-go => k8s.io/client-go v0.27.11 - k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.11 - k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.11 - k8s.io/code-generator => k8s.io/code-generator v0.27.11 - k8s.io/component-base => k8s.io/component-base v0.27.11 - k8s.io/component-helpers => k8s.io/component-helpers v0.27.11 - k8s.io/controller-manager => k8s.io/controller-manager v0.27.11 - k8s.io/cri-api => k8s.io/cri-api v0.27.11 - k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.11 - k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.27.11 - k8s.io/kms => k8s.io/kms v0.27.11 - k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.11 - k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.11 - k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.11 - k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.11 - k8s.io/kubectl => k8s.io/kubectl v0.27.11 - k8s.io/kubelet => k8s.io/kubelet v0.27.11 - k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.11 - k8s.io/metrics => k8s.io/metrics v0.27.11 - k8s.io/mount-utils => k8s.io/mount-utils v0.27.11 - k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.11 - k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.11 - k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.27.11 - k8s.io/sample-controller => k8s.io/sample-controller v0.27.11 + // https://github.com/kubernetes/kubernetes/blob/v1.27.12/go.mod#L249-L279 + k8s.io/api => k8s.io/api v0.27.12 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.12 + k8s.io/apimachinery => k8s.io/apimachinery v0.27.12 + k8s.io/apiserver => k8s.io/apiserver v0.27.12 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.12 + k8s.io/client-go => k8s.io/client-go v0.27.12 + k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.12 + k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.12 + k8s.io/code-generator => k8s.io/code-generator v0.27.12 + k8s.io/component-base => k8s.io/component-base v0.27.12 + k8s.io/component-helpers => k8s.io/component-helpers v0.27.12 + k8s.io/controller-manager => k8s.io/controller-manager v0.27.12 + k8s.io/cri-api => k8s.io/cri-api v0.27.12 + k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.12 + k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.27.12 + k8s.io/kms => k8s.io/kms v0.27.12 + k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.12 + k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.12 + k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.12 + k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.12 + k8s.io/kubectl => k8s.io/kubectl v0.27.12 + k8s.io/kubelet => k8s.io/kubelet v0.27.12 + k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.12 + k8s.io/metrics => k8s.io/metrics v0.27.12 + k8s.io/mount-utils => k8s.io/mount-utils v0.27.12 + k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.12 + k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.12 + k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.27.12 + k8s.io/sample-controller => k8s.io/sample-controller v0.27.12 ) diff --git a/go.sum b/go.sum index c83742ffa428..870a2b388586 100644 --- a/go.sum +++ b/go.sum @@ -394,8 +394,8 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAONeMXrxql8uvOKuAZSu8aM5RUGv+1C6IJaEho= github.com/golangplus/bytes v1.0.0/go.mod h1:AdRaCFwmc/00ZzELMWb01soso6W1R/++O1XL80yAn+A= github.com/golangplus/fmt v1.0.0/go.mod h1:zpM0OfbMCjPtd2qkTD/jX2MgiFCqklhSUFyDW44gVQE= @@ -1448,8 +1448,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.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= 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= @@ -1493,46 +1493,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.11 h1:IsGrWbXt7RkE+arc9GLQPYI5AtZkT+feBMorY+Nzx4I= -k8s.io/api v0.27.11/go.mod h1:SGqTcyqa0e+Db3pgyH6v+por5dO2OdTkKDCdD3Op3Ng= -k8s.io/apiextensions-apiserver v0.27.11 h1:+NZfWpN842yab/O1RRDu8+11eSACA2cPa2VixSxiONM= -k8s.io/apiextensions-apiserver v0.27.11/go.mod h1:BhfSAHizE6MjUiD0FtBxwOakCr8/GLB7Icepd0jk7XU= -k8s.io/apimachinery v0.27.11 h1:ivrKMN7JgdtKhay14S5UQlvilV3z6W+wjiSQTzyr5zc= -k8s.io/apimachinery v0.27.11/go.mod h1:IHu2ovJ60RqxyPSLmTel7KDLdOCRbpOxwtUBmwBnT/E= -k8s.io/apiserver v0.27.11 h1:ztQgOjOlRLeRqii0vWBKmXAPj+NS4RW75sUHk8IobIs= -k8s.io/apiserver v0.27.11/go.mod h1:fQNBsQ2CI0XJz0dD6hLuStPLR9ym6EmUBn5TuUJBsQU= -k8s.io/cli-runtime v0.27.11 h1:vAyvn5fsucgRW2uNhYTYPoc1nD5LJxj3iSP+X7NLK6Y= -k8s.io/cli-runtime v0.27.11/go.mod h1:4WtAVi2YDtleXsVRYcoDZxLg4o5iuRBiOdaOGO0nN+U= -k8s.io/client-go v0.27.11 h1:SZChXsDaN6lB5IYywCpvQs/ZUa5vK2NHkpEwUhoK3fQ= -k8s.io/client-go v0.27.11/go.mod h1:Rg3Yeuk9sX87gpVunVn3AsvMkGZfXuutTDC/jigBNUo= -k8s.io/cloud-provider v0.27.11 h1:Q+n3+aJDaiZBkjHiFJxK1P1kClxucF43WF/m10Udzoo= -k8s.io/cloud-provider v0.27.11/go.mod h1:NDARj8iDJoy0oFALr64AsO7Z1b5CdD77o3xXzJmYlc0= -k8s.io/component-base v0.27.11 h1:oq1xukCfjOlF6Jpe7/1PMOXhzicW3HqaUi8aaBmvCEM= -k8s.io/component-base v0.27.11/go.mod h1:YHs4U6ETkkvGj7NR44ISaSMiDQrV7nPtUnIenALJicw= -k8s.io/component-helpers v0.27.11 h1:bJ+cHp+YnponkR0qg3OGqwJglJ6CowM2lZpMrPPXRzE= -k8s.io/component-helpers v0.27.11/go.mod h1:6w2eYpHKywq4XhVHr7iW57W0wSBeQSyd107U4KSqJoM= -k8s.io/controller-manager v0.27.11 h1:Z/Y/w9ejDcDmKM7PCaNTwVJpXjXyDtu4a5eRM9dYz5U= -k8s.io/controller-manager v0.27.11/go.mod h1:Was1Sl9fNUaoKqdTZWRNA+z4kZt7pYokmTJzrgEWBus= -k8s.io/cri-api v0.27.11 h1:z5aa4rnkns+d7GCsbCAMO5kFw+zlb06tk+Av+vDYg1Q= -k8s.io/cri-api v0.27.11/go.mod h1:Bid1MLlktCFQG6tCTLJfhAddp9IPuF5Xt8kWBwkxkRs= +k8s.io/api v0.27.12 h1:Qprj/nuFj4xjbsAuJ05F1sCHs1d0x33n/Ni0oAVEFDo= +k8s.io/api v0.27.12/go.mod h1:PNRL63V26JzKe2++ho6W/YRp3k9XG7nirN4J7WRy5gY= +k8s.io/apiextensions-apiserver v0.27.12 h1:1A1+0rlOrqKi+LbCTf3MeFbYmBFGoQ9rFHxBgFnhOpE= +k8s.io/apiextensions-apiserver v0.27.12/go.mod h1:KkUHCjJ/Awhly9NnVsYySZtQSxuWU+8IL4p2ffE4JQ8= +k8s.io/apimachinery v0.27.12 h1:Nt20vwaAHcZsM4WdkOtLaDeBJHg9QJW8JyOOEn6xzRA= +k8s.io/apimachinery v0.27.12/go.mod h1:5/SjQaDYQgZOv8kuzNMzmNGrqh4/iyknC5yWjxU9ll8= +k8s.io/apiserver v0.27.12 h1:NYhYDrJgsLSaWPHLy6VydS2i+PyXKUGuAOMWQwVCkuI= +k8s.io/apiserver v0.27.12/go.mod h1:h0W4loXx+QzPlljY4XbDSsk+ob8vGgz2d6d/YZEgd4Y= +k8s.io/cli-runtime v0.27.12 h1:9iMbnrIuKe6B+0iIgMJueXace7e3lEQwU5hOrZM1nBo= +k8s.io/cli-runtime v0.27.12/go.mod h1:UWZLKn9tn/Z451VAVUTGb1bg2Zz7pSf2u7AJPLcJE7g= +k8s.io/client-go v0.27.12 h1:ouIB3ZitBjmBWh/9auP4erVl8AXkheqcmbH7FSFa7DI= +k8s.io/client-go v0.27.12/go.mod h1:h3X7RGr5s9Wm4NtI06Bzt3am4Kj6aXuZQcP7OD+48Sk= +k8s.io/cloud-provider v0.27.12 h1:8boxCbi7uSl7w/3u8WkQ3c0j6QdZH/3ik70sPiO2CN4= +k8s.io/cloud-provider v0.27.12/go.mod h1:Vfoj+1LWgGWzwCbBma5oGaQDNcpbhrqlsJktjhGsYzU= +k8s.io/component-base v0.27.12 h1:2/ooM9/gNxS2fZuRnLj3TWWg7KnEYmRj321du10waZA= +k8s.io/component-base v0.27.12/go.mod h1:SPA6ABqK2HDRuzMjoEEkj7ciDvK5bUpdHtvZQwdi/xM= +k8s.io/component-helpers v0.27.12 h1:bT7oDIXvDHK3nI/yrv2/N9nYmVuttwtR3DKhngbL7nQ= +k8s.io/component-helpers v0.27.12/go.mod h1:Wn2l/7jpmZbC1VpmUTeLYh0Wsp20SFfIYNNJAHSVX7g= +k8s.io/controller-manager v0.27.12 h1:cwaOfgdXqKQhHpxlT1TjKi5AeG861qb3ViulDSH1j30= +k8s.io/controller-manager v0.27.12/go.mod h1:WfUX9MdNP33By4TaznIA1QpCWnydKP36NSSvHxvnfOw= +k8s.io/cri-api v0.27.12 h1:d9WBiGlPNjqQBIM6ZVLJmRO77r4GGBQGjfGl44BZPUA= +k8s.io/cri-api v0.27.12/go.mod h1:t9SglmzvbkAJv8WGBC/laS+J3ro+N3hvXDavSZh8/IU= 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.11 h1:6zRE3QeLHeTaxDXqg7CY44FPd+9/PvRofjrBg8eFfr0= -k8s.io/kms v0.27.11/go.mod h1:B4bthjp9iM2foefi2jW/0Hepi5bvm+8Gjkfkp5jnZmE= -k8s.io/kube-aggregator v0.27.11 h1:BjX0atUDfwnt3edLTFdaGm52KCJSx6gmjADsYA9/UNE= -k8s.io/kube-aggregator v0.27.11/go.mod h1:/1fmDeEQeqkyi7JrcKlll+toDUdyWiMISw1FtaSuxME= +k8s.io/kms v0.27.12 h1:9FnDfhYeeC3yThx+OiYCk8hHpN7oHRYKBpD+9ozYK0E= +k8s.io/kms v0.27.12/go.mod h1:fi8VnrPB0X00h4f7yHz2yIo7MN+XW+MZLykNWUU6WWU= +k8s.io/kube-aggregator v0.27.12 h1:hjMQMs6vjUrt1ST54xECxBj21iYlqi3NzYLtyRKf4Sc= +k8s.io/kube-aggregator v0.27.12/go.mod h1:8ZmqZTzAXmu2SAsDK2SEwcB0MCneWf2TA04HVtstJU4= 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.11 h1:rndS6LxY+qjTsEE/frCRlCL/TWeokWOgynSa3v5lbPM= -k8s.io/kubectl v0.27.11/go.mod h1:1eq/sCLAWOsPaHt/zojqEvVJECOmC68ol6eO4RyC4oc= -k8s.io/kubelet v0.27.11 h1:o6XGh8QdGjXEYCHpdTOSY8GhrxhO80HIX7jWyL3ySvg= -k8s.io/kubelet v0.27.11/go.mod h1:h0ycSyyeSeQfTqJNxBUXF6hwAyETtwTb2oS0GKfaxP4= -k8s.io/kubernetes v1.27.11 h1:Qrd9IwWfkP0BO+LpH0rNttC3ZieMGgZW2mIvb8q9Ynw= -k8s.io/kubernetes v1.27.11/go.mod h1:cRLM3g95AsipdxwaEkPgIFiF+qda0y3UKHyDHVSj6ok= -k8s.io/metrics v0.27.11 h1:f9BQgW0uQ36y9dujRNCk+dTealrDH92NZQLomKRqh/A= -k8s.io/metrics v0.27.11/go.mod h1:yFjS1ikJHpl5Htn4MCspHwNUs6ix3rbRLysiyeIMoHo= -k8s.io/mount-utils v0.27.11 h1:1fTa/fOXxAO4XfQbp/vkwgY/2v5YVO1WQ9NU+uZbumk= -k8s.io/mount-utils v0.27.11/go.mod h1:ZTpotHgWN49RtIuK0Dy98noHxs2D0hqsbKMnwnKgY44= +k8s.io/kubectl v0.27.12 h1:BYRMNxmrazTNp5/CH7QReaMjoeQIESMv34fpDuC1czE= +k8s.io/kubectl v0.27.12/go.mod h1:IKQvyGhgZBY6KEXOcHoV8Ac7NIt/9PqI6MVrtmhi4NA= +k8s.io/kubelet v0.27.12 h1:YuS+iEuk2fmHLOxTtsLGfJWGzXF8vPTaYeSPIusbkAk= +k8s.io/kubelet v0.27.12/go.mod h1:sXoK4QKwMZPj9jennWapX9PaJ6onCHEqHmQxLREunOE= +k8s.io/kubernetes v1.27.12 h1:PrGJKsOsu1GPEyygpgaZl3UYBHjdL3WS7YfAYtINpGs= +k8s.io/kubernetes v1.27.12/go.mod h1:k9v6vyp50gmrtfPnKJypLEJJk/JlCT2jRPY0Hh7QBN4= +k8s.io/metrics v0.27.12 h1:FSrOhJ1LdvMCk+5doBzs+hu6IGyxp41nEjnW0KkaEPI= +k8s.io/metrics v0.27.12/go.mod h1:moXvBzculdWcjF8eNPi7PN4Xk9kHXN/MOsLlGe3B/lw= +k8s.io/mount-utils v0.27.12 h1:C+p6XlShMu075CyasSix7lG9EtkdVOSETYxkBuhpWZI= +k8s.io/mount-utils v0.27.12/go.mod h1:ZTpotHgWN49RtIuK0Dy98noHxs2D0hqsbKMnwnKgY44= 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 1d17179e6300..a7d1ade443db 100644 --- a/hack/tool/go.mod +++ b/hack/tool/go.mod @@ -37,7 +37,7 @@ require ( github.com/go-playground/validator/v10 v10.11.1 // indirect github.com/gofrs/uuid v4.3.1+incompatible // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/google/gnostic v0.6.9 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect @@ -87,11 +87,11 @@ require ( golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.16.1 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/protobuf v1.31.0 // indirect + 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.11 // indirect - k8s.io/client-go v0.27.11 // indirect + k8s.io/apimachinery v0.27.12 // indirect + k8s.io/client-go v0.27.12 // 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 1d90b04b885b..60b0bfdf44b1 100644 --- a/hack/tool/go.sum +++ b/hack/tool/go.sum @@ -125,8 +125,8 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/gnostic v0.6.9 h1:ZK/5VhkoX835RikCHpSUJV9a+S3e1zLh59YnyWeBW+0= github.com/google/gnostic v0.6.9/go.mod h1:Nm8234We1lq6iB9OmlgNv3nH91XLLVZHCDayfA3xq+E= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -435,8 +435,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.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= 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= @@ -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.11 h1:IsGrWbXt7RkE+arc9GLQPYI5AtZkT+feBMorY+Nzx4I= -k8s.io/api v0.27.11/go.mod h1:SGqTcyqa0e+Db3pgyH6v+por5dO2OdTkKDCdD3Op3Ng= -k8s.io/apimachinery v0.27.11 h1:ivrKMN7JgdtKhay14S5UQlvilV3z6W+wjiSQTzyr5zc= -k8s.io/apimachinery v0.27.11/go.mod h1:IHu2ovJ60RqxyPSLmTel7KDLdOCRbpOxwtUBmwBnT/E= -k8s.io/client-go v0.27.11 h1:SZChXsDaN6lB5IYywCpvQs/ZUa5vK2NHkpEwUhoK3fQ= -k8s.io/client-go v0.27.11/go.mod h1:Rg3Yeuk9sX87gpVunVn3AsvMkGZfXuutTDC/jigBNUo= +k8s.io/api v0.27.12 h1:Qprj/nuFj4xjbsAuJ05F1sCHs1d0x33n/Ni0oAVEFDo= +k8s.io/api v0.27.12/go.mod h1:PNRL63V26JzKe2++ho6W/YRp3k9XG7nirN4J7WRy5gY= +k8s.io/apimachinery v0.27.12 h1:Nt20vwaAHcZsM4WdkOtLaDeBJHg9QJW8JyOOEn6xzRA= +k8s.io/apimachinery v0.27.12/go.mod h1:5/SjQaDYQgZOv8kuzNMzmNGrqh4/iyknC5yWjxU9ll8= +k8s.io/client-go v0.27.12 h1:ouIB3ZitBjmBWh/9auP4erVl8AXkheqcmbH7FSFa7DI= +k8s.io/client-go v0.27.12/go.mod h1:h3X7RGr5s9Wm4NtI06Bzt3am4Kj6aXuZQcP7OD+48Sk= 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 ca717218eb37..597ba99b61b1 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.11+k0s.0 -k8s_version=v1.27.11 +k0s_version=v1.27.12+k0s.0 +k8s_version=v1.27.12 sonobuoy_version=0.53.2 ``` ### 2. Environment variables ```shell -TF_VAR_k0s_version=v1.27.11+k0s.0 TF_VAR_sonobuoy_version=0.20.0 TF_VAR_k8s_version=v1.27.11 terraform apply +TF_VAR_k0s_version=v1.27.12+k0s.0 TF_VAR_sonobuoy_version=0.20.0 TF_VAR_k8s_version=v1.27.12 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 e002e783ac03..5f316ffe33fe 100644 --- a/inttest/sonobuoy/README.md +++ b/inttest/sonobuoy/README.md @@ -61,7 +61,7 @@ spec: user: "ubuntu" uploadBinary: true k0s: - version: "1.27.11+k0s.0" + version: "1.27.12+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.11+k0s.0 -INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.27.11+k0s.0 -INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.27.11+k0s.0 +INFO [ssh] 3.250.52.147:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.27.12+k0s.0 +INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.27.12+k0s.0 +INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.27.12+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.11+k0s.0 is now installed +INFO k0s cluster version v1.27.12+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.11 + --kubernetes-version=v1.27.12 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 75618e43c996..250887a5b2cd 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.11+k0s.0 +version: v1.27.12+k0s.0 downloadURLs: k0s: linux-amd64: ..../k0s-amd64 diff --git a/pkg/constant/constant_shared.go b/pkg/constant/constant_shared.go index 0dbf54730b5f..7ab190b43b57 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.11" + KubeProxyImageVersion = "v1.27.12" CoreDNSImage = "quay.io/k0sproject/coredns" CoreDNSImageVersion = "1.10.1" EnvoyProxyImage = "quay.io/k0sproject/envoy-distroless"