feat: update Kubernetes to 1.21.0-beta.1

See CHANGELOG: https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.21.md Refs #3329. Signed-off-by: Alexey Palazhchenko <alexey.palazhchenko@gmail.com>
siderolabs · Mar 30, 2021 · a9451f5 · a9451f5
1 parent 4b42ced
commit a9451f5
Show file tree

Hide file tree

Showing 8 changed files with 97 additions and 66 deletions.
diff --git a/Makefile b/Makefile
@@ -19,7 +19,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.21.0-beta.0/bin/$(OPERATING_SYSTEM)/amd64/kubectl
+KUBECTL_URL ?= https://storage.googleapis.com/kubernetes-release/release/v1.21.0-rc.0/bin/$(OPERATING_SYSTEM)/amd64/kubectl
 CLUSTERCTL_VERSION ?= 0.3.14
 CLUSTERCTL_URL ?= https://github.com/kubernetes-sigs/cluster-api/releases/download/v$(CLUSTERCTL_VERSION)/clusterctl-$(OPERATING_SYSTEM)-amd64
 SONOBUOY_VERSION ?= 0.50.0

diff --git a/go.mod b/go.mod
@@ -94,11 +94,11 @@ require (
 	gopkg.in/freddierice/go-losetup.v1 v1.0.0-20170407175016-fc9adea44124
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 	honnef.co/go/tools v0.1.2 // indirect
-	k8s.io/api v0.21.0-beta.0
-	k8s.io/apimachinery v0.21.0-beta.0
-	k8s.io/apiserver v0.21.0-beta.0 // indirect
-	k8s.io/client-go v0.21.0-beta.0
-	k8s.io/cri-api v0.21.0-beta.0
-	k8s.io/kubectl v0.21.0-beta.0
-	k8s.io/kubelet v0.21.0-beta.0
+	k8s.io/api v0.21.0-rc.0
+	k8s.io/apimachinery v0.21.0-rc.0
+	k8s.io/apiserver v0.21.0-rc.0 // indirect
+	k8s.io/client-go v0.21.0-rc.0
+	k8s.io/cri-api v0.21.0-rc.0
+	k8s.io/kubectl v0.21.0-rc.0
+	k8s.io/kubelet v0.21.0-rc.0
 )
diff --git a/go.sum b/go.sum
diff --git 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-beta.0
+export K8S_VERSION=1.21.0-rc.0
 
 # Sonobuoy
 

diff --git a/internal/integration/provision/upgrade.go b/internal/integration/provision/upgrade.go
@@ -74,9 +74,9 @@ const (
 	stableRelease   = "v0.9.0" // or soon-to-be-stable
 	// The current version (the one being built on CI) is DefaultSettings.CurrentVersion.
 
-	previousK8sVersion = "1.20.1"        // constants.DefaultKubernetesVersion in the previousRelease
-	stableK8sVersion   = "1.20.5"        // constants.DefaultKubernetesVersion in the stableRelease
-	currentK8sVersion  = "1.21.0-beta.0" // next k8s version being tested
+	previousK8sVersion = "1.20.1"      // constants.DefaultKubernetesVersion in the previousRelease
+	stableK8sVersion   = "1.20.5"      // constants.DefaultKubernetesVersion in the stableRelease
+	currentK8sVersion  = "1.21.0-rc.0" // 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
@@ -190,7 +190,7 @@ const (
 	SystemKubeletPKIDir = "/system/secrets/kubelet"
 
 	// DefaultKubernetesVersion is the default target version of the control plane.
-	DefaultKubernetesVersion = "1.21.0-beta.0"
+	DefaultKubernetesVersion = "1.21.0-rc.0"
 
 	// DefaultControlPlanePort is the default port to use for the control plane.
 	DefaultControlPlanePort = 6443

diff --git a/website/content/docs/v0.10/Reference/cli.md b/website/content/docs/v0.10/Reference/cli.md
@@ -103,7 +103,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-beta.0")
+      --kubernetes-version string               desired kubernetes version to run (default "1.21.0-rc.0")
       --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)
@@ -1917,7 +1917,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-beta.0")
+      --to string         the Kubernetes control plane version to upgrade to (default "1.21.0-rc.0")
 ```
 
 ### Options inherited from parent commands

diff --git a/website/content/docs/v0.10/Reference/configuration.md b/website/content/docs/v0.10/Reference/configuration.md
@@ -294,7 +294,7 @@ Examples:
 
 ``` yaml
 kubelet:
-    image: ghcr.io/talos-systems/kubelet:v1.21.0-beta.0 # The `image` field is an optional reference to an alternative kubelet image.
+    image: ghcr.io/talos-systems/kubelet:v1.21.0-rc.0 # 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-beta.0 # The container image used in the API server manifest.
+    image: k8s.gcr.io/kube-apiserver:v1.21.0-rc.0 # 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-beta.0 # The container image used in the controller manager manifest.
+    image: k8s.gcr.io/kube-controller-manager:v1.21.0-rc.0 # 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-beta.0 # The container image used in the kube-proxy manifest.
+    image: k8s.gcr.io/kube-proxy:v1.21.0-rc.0 # 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-beta.0 # The container image used in the scheduler manifest.
+    image: k8s.gcr.io/kube-scheduler:v1.21.0-rc.0 # The container image used in the scheduler manifest.
     # Extra arguments to supply to the scheduler.
     extraArgs:
         feature-gates: AllBeta=true
@@ -1239,7 +1239,7 @@ Appears in:
 
 
 ``` yaml
-image: ghcr.io/talos-systems/kubelet:v1.21.0-beta.0 # The `image` field is an optional reference to an alternative kubelet image.
+image: ghcr.io/talos-systems/kubelet:v1.21.0-rc.0 # 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
@@ -1271,7 +1271,7 @@ Examples:
 
 
 ``` yaml
-image: ghcr.io/talos-systems/kubelet:v1.21.0-beta.0
+image: ghcr.io/talos-systems/kubelet:v1.21.0-rc.0
 ```
 
 
@@ -2269,7 +2269,7 @@ Appears in:
 
 
 ``` yaml
-image: k8s.gcr.io/kube-apiserver:v1.21.0-beta.0 # The container image used in the API server manifest.
+image: k8s.gcr.io/kube-apiserver:v1.21.0-rc.0 # The container image used in the API server manifest.
 # Extra arguments to supply to the API server.
 extraArgs:
     feature-gates: ServerSideApply=true
@@ -2297,7 +2297,7 @@ Examples:
 
 
 ``` yaml
-image: k8s.gcr.io/kube-apiserver:v1.21.0-beta.0
+image: k8s.gcr.io/kube-apiserver:v1.21.0-rc.0
 ```
 
 
@@ -2358,7 +2358,7 @@ Appears in:
 
 
 ``` yaml
-image: k8s.gcr.io/kube-controller-manager:v1.21.0-beta.0 # The container image used in the controller manager manifest.
+image: k8s.gcr.io/kube-controller-manager:v1.21.0-rc.0 # The container image used in the controller manager manifest.
 # Extra arguments to supply to the controller manager.
 extraArgs:
     feature-gates: ServerSideApply=true
@@ -2381,7 +2381,7 @@ Examples:
 
 
 ``` yaml
-image: k8s.gcr.io/kube-controller-manager:v1.21.0-beta.0
+image: k8s.gcr.io/kube-controller-manager:v1.21.0-rc.0
 ```
 
 
@@ -2429,7 +2429,7 @@ Appears in:
 
 
 ``` yaml
-image: k8s.gcr.io/kube-proxy:v1.21.0-beta.0 # The container image used in the kube-proxy manifest.
+image: k8s.gcr.io/kube-proxy:v1.21.0-rc.0 # The container image used in the kube-proxy manifest.
 mode: ipvs # proxy mode of kube-proxy.
 # Extra arguments to supply to kube-proxy.
 extraArgs:
@@ -2476,7 +2476,7 @@ Examples:
 
 
 ``` yaml
-image: k8s.gcr.io/kube-proxy:v1.21.0-beta.0
+image: k8s.gcr.io/kube-proxy:v1.21.0-rc.0
 ```
 
 
@@ -2525,7 +2525,7 @@ Appears in:
 
 
 ``` yaml
-image: k8s.gcr.io/kube-scheduler:v1.21.0-beta.0 # The container image used in the scheduler manifest.
+image: k8s.gcr.io/kube-scheduler:v1.21.0-rc.0 # The container image used in the scheduler manifest.
 # Extra arguments to supply to the scheduler.
 extraArgs:
     feature-gates: AllBeta=true
@@ -2548,7 +2548,7 @@ Examples:
 
 
 ``` yaml
-image: k8s.gcr.io/kube-scheduler:v1.21.0-beta.0
+image: k8s.gcr.io/kube-scheduler:v1.21.0-rc.0
 ```