From 208ac9ac450c615b561fb4be0d398edc738d10d9 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Fri, 20 Aug 2021 21:47:02 +0300 Subject: [PATCH] feat: update Kubernetes to 1.22.1 See https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.22.md#changelog-since-v1220 Signed-off-by: Andrey Smirnov Signed-off-by: Alexey Palazhchenko --- Makefile | 2 +- go.mod | 14 +++---- go.sum | 42 +++++++++---------- hack/release.toml | 4 +- hack/test/e2e.sh | 2 +- pkg/machinery/constants/constants.go | 2 +- website/content/docs/v0.12/Reference/cli.md | 4 +- .../docs/v0.12/Reference/configuration.md | 30 ++++++------- 8 files changed, 50 insertions(+), 50 deletions(-) diff --git a/Makefile b/Makefile index a9825631ee..43f121a5d8 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ OPERATING_SYSTEM := $(shell uname -s | tr "[:upper:]" "[:lower:]") TALOSCTL_DEFAULT_TARGET := talosctl-$(OPERATING_SYSTEM) INTEGRATION_TEST_DEFAULT_TARGET := integration-test-$(OPERATING_SYSTEM) INTEGRATION_TEST_PROVISION_DEFAULT_TARGET := integration-test-provision-$(OPERATING_SYSTEM) -KUBECTL_URL ?= https://storage.googleapis.com/kubernetes-release/release/v1.22.0/bin/$(OPERATING_SYSTEM)/amd64/kubectl +KUBECTL_URL ?= https://storage.googleapis.com/kubernetes-release/release/v1.22.1/bin/$(OPERATING_SYSTEM)/amd64/kubectl CLUSTERCTL_VERSION ?= 0.3.19 CLUSTERCTL_URL ?= https://github.com/kubernetes-sigs/cluster-api/releases/download/v$(CLUSTERCTL_VERSION)/clusterctl-$(OPERATING_SYSTEM)-amd64 SONOBUOY_VERSION ?= 0.53.1 diff --git a/go.mod b/go.mod index 76550bbeb2..942f0141a6 100644 --- a/go.mod +++ b/go.mod @@ -103,11 +103,11 @@ require ( gopkg.in/freddierice/go-losetup.v1 v1.0.0-20170407175016-fc9adea44124 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b inet.af/netaddr v0.0.0-20210721214506-ce7a8ad02cc1 - k8s.io/api v0.22.0 - k8s.io/apimachinery v0.22.0 - k8s.io/apiserver v0.22.0 // indirect; use the same version as other k8s deps - k8s.io/client-go v0.22.0 - k8s.io/cri-api v0.22.0 - k8s.io/kubectl v0.22.0 - k8s.io/kubelet v0.22.0 + k8s.io/api v0.22.1 + k8s.io/apimachinery v0.22.1 + k8s.io/apiserver v0.22.1 // indirect; use the same version as other k8s deps + k8s.io/client-go v0.22.1 + k8s.io/cri-api v0.22.1 + k8s.io/kubectl v0.22.1 + k8s.io/kubelet v0.22.1 ) diff --git a/go.sum b/go.sum index fea8da987a..12b34ebc1e 100644 --- a/go.sum +++ b/go.sum @@ -1844,40 +1844,40 @@ k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo= k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ= k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= k8s.io/api v0.21.3/go.mod h1:hUgeYHUbBp23Ue4qdX9tR8/ANi/g3ehylAqDn9NWVOg= -k8s.io/api v0.22.0 h1:elCpMZ9UE8dLdYxr55E06TmSeji9I3KH494qH70/y+c= -k8s.io/api v0.22.0/go.mod h1:0AoXXqst47OI/L0oGKq9DG61dvGRPXs7X4/B7KyjBCU= +k8s.io/api v0.22.1 h1:ISu3tD/jRhYfSW8jI/Q1e+lRxkR7w9UwQEZ7FgslrwY= +k8s.io/api v0.22.1/go.mod h1:bh13rkTp3F1XEaLGykbyRD2QaTTzPm0e/BMd8ptFONY= k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc= k8s.io/apimachinery v0.21.3/go.mod h1:H/IM+5vH9kZRNJ4l3x/fXP/5bOPJaVP/guptnZPeCFI= -k8s.io/apimachinery v0.22.0 h1:CqH/BdNAzZl+sr3tc0D3VsK3u6ARVSo3GWyLmfIjbP0= -k8s.io/apimachinery v0.22.0/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0= +k8s.io/apimachinery v0.22.1 h1:DTARnyzmdHMz7bFWFDDm22AM4pLWTQECMpRTFu2d2OM= +k8s.io/apimachinery v0.22.1/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0= k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM= k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q= -k8s.io/apiserver v0.22.0 h1:KZh2asnRBjawLLfPOi6qiD+A2jaNt31HCnZG6AX3Qcs= -k8s.io/apiserver v0.22.0/go.mod h1:04kaIEzIQrTGJ5syLppQWvpkLJXQtJECHmae+ZGc/nc= -k8s.io/cli-runtime v0.22.0 h1:xM0UJ91iPKvPeooS/LS4U3sPVRAeUrUslJ0sUtE7a7Q= -k8s.io/cli-runtime v0.22.0/go.mod h1:An6zELQ7udUI0GaXvkuMqyopPA14dIgNqpH8cZu1vig= +k8s.io/apiserver v0.22.1 h1:Ul9Iv8OMB2s45h2tl5XWPpAZo1VPIJ/6N+MESeed7L8= +k8s.io/apiserver v0.22.1/go.mod h1:2mcM6dzSt+XndzVQJX21Gx0/Klo7Aen7i0Ai6tIa400= +k8s.io/cli-runtime v0.22.1 h1:WIueieKvT+IiSVSFosRLI6rkM0tyBGEGH1WUEztVjho= +k8s.io/cli-runtime v0.22.1/go.mod h1:YqwGrlXeEk15Yn3em2xzr435UGwbrCw5x+COQoTYfoo= k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y= k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k= k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0= k8s.io/client-go v0.21.3/go.mod h1:+VPhCgTsaFmGILxR/7E1N0S+ryO010QBeNCv5JwRGYU= -k8s.io/client-go v0.22.0 h1:sD6o9O6tCwUKCENw8v+HFsuAbq2jCu8cWC61/ydwA50= -k8s.io/client-go v0.22.0/go.mod h1:GUjIuXR5PiEv/RVK5OODUsm6eZk7wtSWZSaSJbpFdGg= -k8s.io/code-generator v0.22.0/go.mod h1:eV77Y09IopzeXOJzndrDyCI88UBok2h6WxAlBwpxa+o= +k8s.io/client-go v0.22.1 h1:jW0ZSHi8wW260FvcXHkIa0NLxFBQszTlhiAVsU5mopw= +k8s.io/client-go v0.22.1/go.mod h1:BquC5A4UOo4qVDUtoc04/+Nxp1MeHcVc1HJm1KmG8kk= +k8s.io/code-generator v0.22.1/go.mod h1:eV77Y09IopzeXOJzndrDyCI88UBok2h6WxAlBwpxa+o= k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk= k8s.io/component-base v0.20.4/go.mod h1:t4p9EdiagbVCJKrQ1RsA5/V4rFQNDfRlevJajlGwgjI= k8s.io/component-base v0.20.6/go.mod h1:6f1MPBAeI+mvuts3sIdtpjljHWBQ2cIy38oBIWMYnrM= -k8s.io/component-base v0.22.0 h1:ZTmX8hUqH9T9gc0mM42O+KDgtwTYbVTt2MwmLP0eK8A= -k8s.io/component-base v0.22.0/go.mod h1:SXj6Z+V6P6GsBhHZVbWCw9hFjUdUYnJerlhhPnYCBCg= -k8s.io/component-helpers v0.22.0/go.mod h1:YNIbQI59ayNiU8JHlPIxVkOUYycbKhk5Niy0pcyJOEY= +k8s.io/component-base v0.22.1 h1:SFqIXsEN3v3Kkr1bS6rstrs1wd45StJqbtgbQ4nRQdo= +k8s.io/component-base v0.22.1/go.mod h1:0D+Bl8rrnsPN9v0dyYvkqFfBeAd4u7n77ze+p8CMiPo= +k8s.io/component-helpers v0.22.1/go.mod h1:QvBcDbX+qU5I2tMZABBF5fRwAlQwiv771IGBHK9WYh4= k8s.io/cri-api v0.17.3/go.mod h1:X1sbHmuXhwaHs9xxYffLqJogVsnI+f6cPRcgPel7ywM= k8s.io/cri-api v0.20.1/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= k8s.io/cri-api v0.20.4/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= k8s.io/cri-api v0.20.6/go.mod h1:ew44AjNXwyn1s0U4xCKGodU7J1HzBeZ1MpGrpa5r8Yc= -k8s.io/cri-api v0.22.0 h1:YECUji0xxCTCWFO/TUkrL1b44Ip6mZJbiqP6Us/+Vys= -k8s.io/cri-api v0.22.0/go.mod h1:mj5DGUtElRyErU5AZ8EM0ahxbElYsaLAMTPhLPQ40Eg= +k8s.io/cri-api v0.22.1 h1:0fXodf9DfjJRQi0SsAay6RX8ITQzt/5DFuR/BzOc1L4= +k8s.io/cri-api v0.22.1/go.mod h1:mj5DGUtElRyErU5AZ8EM0ahxbElYsaLAMTPhLPQ40Eg= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= @@ -1892,12 +1892,12 @@ k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAG k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e h1:KLHHjkdQFomZy8+06csTWZ0m1343QqxZhR2LJ1OxCYM= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= -k8s.io/kubectl v0.22.0 h1:EBb7xLUaidG/YXAI5AXam3lK2VlnoFShhlMjnJVTbGA= -k8s.io/kubectl v0.22.0/go.mod h1:eeuP92uZbVL2UnOaf0nj9OjtI0hi/nekHU+0isURer0= -k8s.io/kubelet v0.22.0 h1:cVu1RWuikW9dMJSXDG2f6k81u7NuURrnzphgY/tQxZE= -k8s.io/kubelet v0.22.0/go.mod h1:CMdsuh9OFgbpeE+n46GpVMDecLlI0HxSRHMoNrTmJk4= +k8s.io/kubectl v0.22.1 h1:kpXO+ajPNTzAVLDM9pAzCsWH9MtCMr92zpcvXMt7P6E= +k8s.io/kubectl v0.22.1/go.mod h1:mjAOgEbMNMtZWxnfM6jd+nPjPsaoLqO5xanc78WcSbw= +k8s.io/kubelet v0.22.1 h1:ssJ3DxLXtuC3lG4Gif8h1krw5ahSi1fNnzfyZW+Cn/Y= +k8s.io/kubelet v0.22.1/go.mod h1:rZuP1msr5NH7IGApW60DYFR3Cs3On4ftWLMJRfg+iU4= k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= -k8s.io/metrics v0.22.0/go.mod h1:eYnwafAUNLLpVmY/msoq0RKIKH5C4TzfjKnMZ0Xrt3A= +k8s.io/metrics v0.22.1/go.mod h1:i/ZNap89UkV1gLa26dn7fhKAdheJaKy+moOqJbiif7E= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9 h1:imL9YgXQ9p7xmPzHFm/vVd/cF78jad+n4wK1ABwYtMM= k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= diff --git a/hack/release.toml b/hack/release.toml index 8e0536b596..2b1bfe1097 100644 --- a/hack/release.toml +++ b/hack/release.toml @@ -55,8 +55,8 @@ the default values overwritten by Talos. [notes.updates] title = "Component Updates" description = """\ -* Linux: 5.10.57 -* Kubernetes: 1.22.0 +* Linux: 5.10.58 +* Kubernetes: 1.22.1 * containerd: 1.5.5 * runc: 1.0.1 * GRUB: 2.06 diff --git a/hack/test/e2e.sh b/hack/test/e2e.sh index db2080e339..a5b0e05959 100755 --- a/hack/test/e2e.sh +++ b/hack/test/e2e.sh @@ -31,7 +31,7 @@ export TALOS_VERSION=v0.11 # Kubernetes export KUBECONFIG="${TMP}/kubeconfig" -export K8S_VERSION=${K8S_VERSION:-1.22.0} +export K8S_VERSION=${K8S_VERSION:-1.22.1} # Sonobuoy diff --git a/pkg/machinery/constants/constants.go b/pkg/machinery/constants/constants.go index 811a8021c4..bcbdde105b 100644 --- a/pkg/machinery/constants/constants.go +++ b/pkg/machinery/constants/constants.go @@ -200,7 +200,7 @@ const ( SystemKubeletPKIDir = "/system/secrets/kubelet" // DefaultKubernetesVersion is the default target version of the control plane. - DefaultKubernetesVersion = "1.22.0" + DefaultKubernetesVersion = "1.22.1" // DefaultControlPlanePort is the default port to use for the control plane. DefaultControlPlanePort = 6443 diff --git a/website/content/docs/v0.12/Reference/cli.md b/website/content/docs/v0.12/Reference/cli.md index 4f0300c867..468d7a6511 100644 --- a/website/content/docs/v0.12/Reference/cli.md +++ b/website/content/docs/v0.12/Reference/cli.md @@ -119,7 +119,7 @@ talosctl cluster create [flags] --ipv4 enable IPv4 network in the cluster (default true) --ipv6 enable IPv6 network in the cluster (QEMU provisioner only) --iso-path string the ISO path to use for the initial boot (VM only) - --kubernetes-version string desired kubernetes version to run (default "1.22.0") + --kubernetes-version string desired kubernetes version to run (default "1.22.1") --masters int the number of masters to create (default 1) --memory int the limit on memory usage in MB (each container/VM) (default 2048) --mtu int MTU of the cluster network (default 1500) @@ -2012,7 +2012,7 @@ talosctl upgrade-k8s [flags] --endpoint string the cluster control plane endpoint --from string the Kubernetes control plane version to upgrade from -h, --help help for upgrade-k8s - --to string the Kubernetes control plane version to upgrade to (default "1.22.0") + --to string the Kubernetes control plane version to upgrade to (default "1.22.1") ``` ### Options inherited from parent commands diff --git a/website/content/docs/v0.12/Reference/configuration.md b/website/content/docs/v0.12/Reference/configuration.md index a7c186fdfc..62adea89b9 100644 --- a/website/content/docs/v0.12/Reference/configuration.md +++ b/website/content/docs/v0.12/Reference/configuration.md @@ -284,7 +284,7 @@ Examples: ``` yaml kubelet: - image: ghcr.io/talos-systems/kubelet:v1.22.0 # The `image` field is an optional reference to an alternative kubelet image. + image: ghcr.io/talos-systems/kubelet:v1.22.1 # The `image` field is an optional reference to an alternative kubelet image. # The `extraArgs` field is used to provide additional flags to the kubelet. extraArgs: feature-gates: ServerSideApply=true @@ -984,7 +984,7 @@ Examples: ``` yaml apiServer: - image: k8s.gcr.io/kube-apiserver:v1.22.0 # The container image used in the API server manifest. + image: k8s.gcr.io/kube-apiserver:v1.22.1 # The container image used in the API server manifest. # Extra arguments to supply to the API server. extraArgs: feature-gates: ServerSideApply=true @@ -1015,7 +1015,7 @@ Examples: ``` yaml controllerManager: - image: k8s.gcr.io/kube-controller-manager:v1.22.0 # The container image used in the controller manager manifest. + image: k8s.gcr.io/kube-controller-manager:v1.22.1 # The container image used in the controller manager manifest. # Extra arguments to supply to the controller manager. extraArgs: feature-gates: ServerSideApply=true @@ -1041,7 +1041,7 @@ Examples: ``` yaml proxy: - image: k8s.gcr.io/kube-proxy:v1.22.0 # The container image used in the kube-proxy manifest. + image: k8s.gcr.io/kube-proxy:v1.22.1 # The container image used in the kube-proxy manifest. mode: ipvs # proxy mode of kube-proxy. # Extra arguments to supply to kube-proxy. extraArgs: @@ -1068,7 +1068,7 @@ Examples: ``` yaml scheduler: - image: k8s.gcr.io/kube-scheduler:v1.22.0 # The container image used in the scheduler manifest. + image: k8s.gcr.io/kube-scheduler:v1.22.1 # The container image used in the scheduler manifest. # Extra arguments to supply to the scheduler. extraArgs: feature-gates: AllBeta=true @@ -1315,7 +1315,7 @@ Appears in: ``` yaml -image: ghcr.io/talos-systems/kubelet:v1.22.0 # The `image` field is an optional reference to an alternative kubelet image. +image: ghcr.io/talos-systems/kubelet:v1.22.1 # The `image` field is an optional reference to an alternative kubelet image. # The `extraArgs` field is used to provide additional flags to the kubelet. extraArgs: feature-gates: ServerSideApply=true @@ -1352,7 +1352,7 @@ Examples: ``` yaml -image: ghcr.io/talos-systems/kubelet:v1.22.0 +image: ghcr.io/talos-systems/kubelet:v1.22.1 ``` @@ -2328,7 +2328,7 @@ Appears in: ``` yaml -image: k8s.gcr.io/kube-apiserver:v1.22.0 # The container image used in the API server manifest. +image: k8s.gcr.io/kube-apiserver:v1.22.1 # The container image used in the API server manifest. # Extra arguments to supply to the API server. extraArgs: feature-gates: ServerSideApply=true @@ -2356,7 +2356,7 @@ Examples: ``` yaml -image: k8s.gcr.io/kube-apiserver:v1.22.0 +image: k8s.gcr.io/kube-apiserver:v1.22.1 ``` @@ -2423,7 +2423,7 @@ Appears in: ``` yaml -image: k8s.gcr.io/kube-controller-manager:v1.22.0 # The container image used in the controller manager manifest. +image: k8s.gcr.io/kube-controller-manager:v1.22.1 # The container image used in the controller manager manifest. # Extra arguments to supply to the controller manager. extraArgs: feature-gates: ServerSideApply=true @@ -2446,7 +2446,7 @@ Examples: ``` yaml -image: k8s.gcr.io/kube-controller-manager:v1.22.0 +image: k8s.gcr.io/kube-controller-manager:v1.22.1 ``` @@ -2489,7 +2489,7 @@ Appears in: ``` yaml -image: k8s.gcr.io/kube-proxy:v1.22.0 # The container image used in the kube-proxy manifest. +image: k8s.gcr.io/kube-proxy:v1.22.1 # The container image used in the kube-proxy manifest. mode: ipvs # proxy mode of kube-proxy. # Extra arguments to supply to kube-proxy. extraArgs: @@ -2535,7 +2535,7 @@ Examples: ``` yaml -image: k8s.gcr.io/kube-proxy:v1.22.0 +image: k8s.gcr.io/kube-proxy:v1.22.1 ``` @@ -2579,7 +2579,7 @@ Appears in: ``` yaml -image: k8s.gcr.io/kube-scheduler:v1.22.0 # The container image used in the scheduler manifest. +image: k8s.gcr.io/kube-scheduler:v1.22.1 # The container image used in the scheduler manifest. # Extra arguments to supply to the scheduler. extraArgs: feature-gates: AllBeta=true @@ -2602,7 +2602,7 @@ Examples: ``` yaml -image: k8s.gcr.io/kube-scheduler:v1.22.0 +image: k8s.gcr.io/kube-scheduler:v1.22.1 ```