feat: update Kubernetes to 1.22.2

See https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.22.md Signed-off-by: Andrey Smirnov <andrey.smirnov@talos-systems.com> (cherry picked from commit d943bb0)
siderolabs · Sep 17, 2021 · ccb24bc · ccb24bc
1 parent 1105518
commit ccb24bc
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 20 deletions.
diff --git 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.1/bin/$(OPERATING_SYSTEM)/amd64/kubectl
+KUBECTL_URL ?= https://storage.googleapis.com/kubernetes-release/release/v1.22.2/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/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.1}
+export K8S_VERSION=${K8S_VERSION:-1.22.2}
 
 # Sonobuoy
 

diff --git a/internal/integration/provision/upgrade.go b/internal/integration/provision/upgrade.go
@@ -2,6 +2,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+//go:build integration_provision
 // +build integration_provision
 
 package provision

diff --git 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.1"
+	DefaultKubernetesVersion = "1.22.2"
 
 	// 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
@@ -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.1")
+      --kubernetes-version string               desired kubernetes version to run (default "1.22.2")
       --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.1")
+      --to string         the Kubernetes control plane version to upgrade to (default "1.22.2")
 ```
 
 ### 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
@@ -284,7 +284,7 @@ Examples:
 
 ``` yaml
 kubelet:
-    image: ghcr.io/talos-systems/kubelet:v1.22.1 # The `image` field is an optional reference to an alternative kubelet image.
+    image: ghcr.io/talos-systems/kubelet:v1.22.2 # 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.1 # The container image used in the API server manifest.
+    image: k8s.gcr.io/kube-apiserver:v1.22.2 # 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.1 # The container image used in the controller manager manifest.
+    image: k8s.gcr.io/kube-controller-manager:v1.22.2 # 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.1 # The container image used in the kube-proxy manifest.
+    image: k8s.gcr.io/kube-proxy:v1.22.2 # 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.1 # The container image used in the scheduler manifest.
+    image: k8s.gcr.io/kube-scheduler:v1.22.2 # 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.1 # The `image` field is an optional reference to an alternative kubelet image.
+image: ghcr.io/talos-systems/kubelet:v1.22.2 # 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.1
+image: ghcr.io/talos-systems/kubelet:v1.22.2
 ```
 
 
@@ -2328,7 +2328,7 @@ Appears in:
 
 
 ``` yaml
-image: k8s.gcr.io/kube-apiserver:v1.22.1 # The container image used in the API server manifest.
+image: k8s.gcr.io/kube-apiserver:v1.22.2 # 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.1
+image: k8s.gcr.io/kube-apiserver:v1.22.2
 ```
 
 
@@ -2423,7 +2423,7 @@ Appears in:
 
 
 ``` yaml
-image: k8s.gcr.io/kube-controller-manager:v1.22.1 # The container image used in the controller manager manifest.
+image: k8s.gcr.io/kube-controller-manager:v1.22.2 # 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.1
+image: k8s.gcr.io/kube-controller-manager:v1.22.2
 ```
 
 
@@ -2489,7 +2489,7 @@ Appears in:
 
 
 ``` yaml
-image: k8s.gcr.io/kube-proxy:v1.22.1 # The container image used in the kube-proxy manifest.
+image: k8s.gcr.io/kube-proxy:v1.22.2 # 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.1
+image: k8s.gcr.io/kube-proxy:v1.22.2
 ```
 
 
@@ -2579,7 +2579,7 @@ Appears in:
 
 
 ``` yaml
-image: k8s.gcr.io/kube-scheduler:v1.22.1 # The container image used in the scheduler manifest.
+image: k8s.gcr.io/kube-scheduler:v1.22.2 # 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.1
+image: k8s.gcr.io/kube-scheduler:v1.22.2
 ```