From 76e38b7b8251548292ae15ecda2bfa1c8ddc5cf3 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Thu, 13 May 2021 16:07:59 +0300 Subject: [PATCH] feat: update Kubernetes to 1.21.1 See https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.21.md Signed-off-by: Andrey Smirnov --- Makefile | 4 +-- hack/test/e2e.sh | 2 +- internal/integration/provision/upgrade.go | 10 +++---- pkg/machinery/constants/constants.go | 2 +- website/content/docs/v0.11/Reference/cli.md | 4 +-- .../docs/v0.11/Reference/configuration.md | 30 +++++++++---------- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index 2a245d027a..2f979af883 100644 --- a/Makefile +++ b/Makefile @@ -21,13 +21,13 @@ 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.21.0/bin/$(OPERATING_SYSTEM)/amd64/kubectl +KUBECTL_URL ?= https://storage.googleapis.com/kubernetes-release/release/v1.21.1/bin/$(OPERATING_SYSTEM)/amd64/kubectl CLUSTERCTL_VERSION ?= 0.3.15 CLUSTERCTL_URL ?= https://github.com/kubernetes-sigs/cluster-api/releases/download/v$(CLUSTERCTL_VERSION)/clusterctl-$(OPERATING_SYSTEM)-amd64 SONOBUOY_VERSION ?= 0.50.0 SONOBUOY_URL ?= https://github.com/vmware-tanzu/sonobuoy/releases/download/v$(SONOBUOY_VERSION)/sonobuoy_$(SONOBUOY_VERSION)_$(OPERATING_SYSTEM)_amd64.tar.gz TESTPKGS ?= github.com/talos-systems/talos/... -RELEASES ?= v0.9.1 v0.10.0-alpha.2 +RELEASES ?= v0.9.3 v0.10.1 SHORT_INTEGRATION_TEST ?= CUSTOM_CNI_URL ?= diff --git a/hack/test/e2e.sh b/hack/test/e2e.sh index 2ff4f88907..2f4bfb2680 100755 --- a/hack/test/e2e.sh +++ b/hack/test/e2e.sh @@ -31,7 +31,7 @@ export TALOS_VERSION=v0.9 # Kubernetes export KUBECONFIG="${TMP}/kubeconfig" -export K8S_VERSION=1.21.0 +export K8S_VERSION=1.21.1 # Sonobuoy diff --git a/internal/integration/provision/upgrade.go b/internal/integration/provision/upgrade.go index 05e6fcab58..bfebf3928b 100644 --- a/internal/integration/provision/upgrade.go +++ b/internal/integration/provision/upgrade.go @@ -68,13 +68,13 @@ type upgradeSpec struct { } const ( - previousRelease = "v0.9.1" - stableRelease = "v0.10.0-alpha.2" // or soon-to-be-stable + previousRelease = "v0.9.3" + stableRelease = "v0.10.1" // or soon-to-be-stable // The current version (the one being built on CI) is DefaultSettings.CurrentVersion. - previousK8sVersion = "1.20.2" // constants.DefaultKubernetesVersion in the previousRelease - stableK8sVersion = "1.21.0-rc.0" // constants.DefaultKubernetesVersion in the stableRelease - currentK8sVersion = "1.21.0" // next k8s version being tested + previousK8sVersion = "1.20.6" // constants.DefaultKubernetesVersion in the previousRelease + stableK8sVersion = "1.21.0" // constants.DefaultKubernetesVersion in the stableRelease + currentK8sVersion = "1.21.1" // next k8s version being tested ) var defaultNameservers = []net.IP{net.ParseIP("8.8.8.8"), net.ParseIP("1.1.1.1")} diff --git a/pkg/machinery/constants/constants.go b/pkg/machinery/constants/constants.go index 16efb37c4d..98dc4fc7c7 100644 --- a/pkg/machinery/constants/constants.go +++ b/pkg/machinery/constants/constants.go @@ -192,7 +192,7 @@ const ( SystemKubeletPKIDir = "/system/secrets/kubelet" // DefaultKubernetesVersion is the default target version of the control plane. - DefaultKubernetesVersion = "1.21.0" + DefaultKubernetesVersion = "1.21.1" // DefaultControlPlanePort is the default port to use for the control plane. DefaultControlPlanePort = 6443 diff --git a/website/content/docs/v0.11/Reference/cli.md b/website/content/docs/v0.11/Reference/cli.md index 3076d84270..86a2182377 100644 --- a/website/content/docs/v0.11/Reference/cli.md +++ b/website/content/docs/v0.11/Reference/cli.md @@ -118,7 +118,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.21.0") + --kubernetes-version string desired kubernetes version to run (default "1.21.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) @@ -2015,7 +2015,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.21.0") + --to string the Kubernetes control plane version to upgrade to (default "1.21.1") ``` ### Options inherited from parent commands diff --git a/website/content/docs/v0.11/Reference/configuration.md b/website/content/docs/v0.11/Reference/configuration.md index e5c123cbca..86546f3ed1 100644 --- a/website/content/docs/v0.11/Reference/configuration.md +++ b/website/content/docs/v0.11/Reference/configuration.md @@ -294,7 +294,7 @@ Examples: ``` yaml kubelet: - image: ghcr.io/talos-systems/kubelet:v1.21.0 # The `image` field is an optional reference to an alternative kubelet image. + image: ghcr.io/talos-systems/kubelet:v1.21.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 @@ -948,7 +948,7 @@ Examples: ``` yaml apiServer: - image: k8s.gcr.io/kube-apiserver:v1.21.0 # The container image used in the API server manifest. + image: k8s.gcr.io/kube-apiserver:v1.21.1 # The container image used in the API server manifest. # Extra arguments to supply to the API server. extraArgs: feature-gates: ServerSideApply=true @@ -980,7 +980,7 @@ Examples: ``` yaml controllerManager: - image: k8s.gcr.io/kube-controller-manager:v1.21.0 # The container image used in the controller manager manifest. + image: k8s.gcr.io/kube-controller-manager:v1.21.1 # The container image used in the controller manager manifest. # Extra arguments to supply to the controller manager. extraArgs: feature-gates: ServerSideApply=true @@ -1007,7 +1007,7 @@ Examples: ``` yaml proxy: - image: k8s.gcr.io/kube-proxy:v1.21.0 # The container image used in the kube-proxy manifest. + image: k8s.gcr.io/kube-proxy:v1.21.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: @@ -1035,7 +1035,7 @@ Examples: ``` yaml scheduler: - image: k8s.gcr.io/kube-scheduler:v1.21.0 # The container image used in the scheduler manifest. + image: k8s.gcr.io/kube-scheduler:v1.21.1 # The container image used in the scheduler manifest. # Extra arguments to supply to the scheduler. extraArgs: feature-gates: AllBeta=true @@ -1273,7 +1273,7 @@ Appears in: ``` yaml -image: ghcr.io/talos-systems/kubelet:v1.21.0 # The `image` field is an optional reference to an alternative kubelet image. +image: ghcr.io/talos-systems/kubelet:v1.21.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 @@ -1305,7 +1305,7 @@ Examples: ``` yaml -image: ghcr.io/talos-systems/kubelet:v1.21.0 +image: ghcr.io/talos-systems/kubelet:v1.21.1 ``` @@ -2296,7 +2296,7 @@ Appears in: ``` yaml -image: k8s.gcr.io/kube-apiserver:v1.21.0 # The container image used in the API server manifest. +image: k8s.gcr.io/kube-apiserver:v1.21.1 # The container image used in the API server manifest. # Extra arguments to supply to the API server. extraArgs: feature-gates: ServerSideApply=true @@ -2324,7 +2324,7 @@ Examples: ``` yaml -image: k8s.gcr.io/kube-apiserver:v1.21.0 +image: k8s.gcr.io/kube-apiserver:v1.21.1 ``` @@ -2385,7 +2385,7 @@ Appears in: ``` yaml -image: k8s.gcr.io/kube-controller-manager:v1.21.0 # The container image used in the controller manager manifest. +image: k8s.gcr.io/kube-controller-manager:v1.21.1 # The container image used in the controller manager manifest. # Extra arguments to supply to the controller manager. extraArgs: feature-gates: ServerSideApply=true @@ -2408,7 +2408,7 @@ Examples: ``` yaml -image: k8s.gcr.io/kube-controller-manager:v1.21.0 +image: k8s.gcr.io/kube-controller-manager:v1.21.1 ``` @@ -2456,7 +2456,7 @@ Appears in: ``` yaml -image: k8s.gcr.io/kube-proxy:v1.21.0 # The container image used in the kube-proxy manifest. +image: k8s.gcr.io/kube-proxy:v1.21.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: @@ -2503,7 +2503,7 @@ Examples: ``` yaml -image: k8s.gcr.io/kube-proxy:v1.21.0 +image: k8s.gcr.io/kube-proxy:v1.21.1 ``` @@ -2552,7 +2552,7 @@ Appears in: ``` yaml -image: k8s.gcr.io/kube-scheduler:v1.21.0 # The container image used in the scheduler manifest. +image: k8s.gcr.io/kube-scheduler:v1.21.1 # The container image used in the scheduler manifest. # Extra arguments to supply to the scheduler. extraArgs: feature-gates: AllBeta=true @@ -2575,7 +2575,7 @@ Examples: ``` yaml -image: k8s.gcr.io/kube-scheduler:v1.21.0 +image: k8s.gcr.io/kube-scheduler:v1.21.1 ```