feat: update Kubernetes to 1.20.0

Official K8s release matching Talos 0.8.0.

Signed-off-by: Andrey Smirnov <smirnov.andrey@gmail.com>
This commit is contained in:
Andrey Smirnov 2020-12-09 15:56:58 +03:00 committed by talos-bot
parent dc0a1e1ca9
commit 872e792dbc
9 changed files with 44 additions and 44 deletions

View File

@ -18,7 +18,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.20.0-rc.0/bin/$(OPERATING_SYSTEM)/amd64/kubectl
KUBECTL_URL ?= https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/$(OPERATING_SYSTEM)/amd64/kubectl
CLUSTERCTL_VERSION ?= 0.3.7
CLUSTERCTL_URL ?= https://github.com/kubernetes-sigs/cluster-api/releases/download/v$(CLUSTERCTL_VERSION)/clusterctl-$(OPERATING_SYSTEM)-amd64
SONOBUOY_VERSION ?= 0.19.0

12
go.mod
View File

@ -84,10 +84,10 @@ require (
gopkg.in/freddierice/go-losetup.v1 v1.0.0-20170407175016-fc9adea44124
gopkg.in/fsnotify.v1 v1.4.7
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776
k8s.io/api v0.20.0-rc.0
k8s.io/apimachinery v0.20.0-rc.0
k8s.io/apiserver v0.20.0-rc.0
k8s.io/client-go v0.20.0-rc.0
k8s.io/cri-api v0.20.0-rc.0
k8s.io/kubelet v0.20.0-rc.0
k8s.io/api v0.20.0
k8s.io/apimachinery v0.20.0
k8s.io/apiserver v0.20.0
k8s.io/client-go v0.20.0
k8s.io/cri-api v0.20.0
k8s.io/kubelet v0.20.0
)

28
go.sum
View File

@ -1421,8 +1421,8 @@ k8s.io/api v0.0.0-20191016110408-35e52d86657a/go.mod h1:/L5qH+AD540e7Cetbui1tuJe
k8s.io/api v0.0.0-20191109101513-0171b7c15da1/go.mod h1:VJq7+38rpM4TSUbRiZX4P5UVAKK2UQpNQLZClkFQkpE=
k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78=
k8s.io/api v0.18.5/go.mod h1:tN+e/2nbdGKOAH55NMV8oGrMG+3uRlA9GaRfvnCCSNk=
k8s.io/api v0.20.0-rc.0 h1:ERFG4pxhPYsEIw7DXM/Z6ySerDLnea8XXdDsIPQUPrA=
k8s.io/api v0.20.0-rc.0/go.mod h1:TZGvMxsQZeBZGKMy/829njHkd9HmnW0LWYhY3IVAoKs=
k8s.io/api v0.20.0 h1:WwrYoZNM1W1aQEbyl8HNG+oWGzLpZQBlcerS9BQw9yI=
k8s.io/api v0.20.0/go.mod h1:HyLC5l5eoS/ygQYl1BXBgFzWNlkHiAuyNAbevIn+FKg=
k8s.io/apiextensions-apiserver v0.0.0-20190202013456-d4288ab64945/go.mod h1:IxkesAMoaCRoLrPJdZNZUQp9NfZnzqaVzLhb2VEQzXE=
k8s.io/apiextensions-apiserver v0.18.2 h1:I4v3/jAuQC+89L3Z7dDgAiN4EOjN6sbm6iBqQwHTah8=
k8s.io/apiextensions-apiserver v0.18.2/go.mod h1:q3faSnRGmYimiocj6cHQ1I3WpLqmDgJFlKL37fC4ZvY=
@ -1431,23 +1431,23 @@ k8s.io/apimachinery v0.0.0-20191109100837-dffb012825f2/go.mod h1:+6CX7hP4aLfX2sb
k8s.io/apimachinery v0.0.0-20191111054156-6eb29fdf75dc/go.mod h1:+6CX7hP4aLfX2sb91JYDMIp0VqDSog2kZu0BHe+lP+s=
k8s.io/apimachinery v0.18.2/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA=
k8s.io/apimachinery v0.18.5/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko=
k8s.io/apimachinery v0.20.0-rc.0 h1:iL1dI0iENDKi1rHhBdOTP72+AEwuNzRQzKThyq985d4=
k8s.io/apimachinery v0.20.0-rc.0/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
k8s.io/apimachinery v0.20.0 h1:jjzbTJRXk0unNS71L7h3lxGDH/2HPxMPaQY+MjECKL8=
k8s.io/apimachinery v0.20.0/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
k8s.io/apiserver v0.18.2/go.mod h1:Xbh066NqrZO8cbsoenCwyDJ1OSi8Ag8I2lezeHxzwzw=
k8s.io/apiserver v0.20.0-rc.0 h1:6bJWjyFjcXsxKO6517Bc3HrNNgVgjNpBahF8VskBXkY=
k8s.io/apiserver v0.20.0-rc.0/go.mod h1:xUT94gmmnJ9RNjdK/ULDFi1CDyypbJuZdEJ1oOO0HGA=
k8s.io/apiserver v0.20.0 h1:0MwO4xCoqZwhoLbFyyBSJdu55CScp4V4sAgX6z4oPBY=
k8s.io/apiserver v0.20.0/go.mod h1:6gRIWiOkvGvQt12WTYmsiYoUyYW0FXSiMdNl4m+sxY8=
k8s.io/client-go v0.0.0-20191016111102-bec269661e48/go.mod h1:hrwktSwYGI4JK+TJA3dMaFyyvHVi/aLarVHpbs8bgCU=
k8s.io/client-go v0.18.2/go.mod h1:Xcm5wVGXX9HAA2JJ2sSBUn3tCJ+4SVlCbl2MNNv+CIU=
k8s.io/client-go v0.18.5/go.mod h1:EsiD+7Fx+bRckKWZXnAXRKKetm1WuzPagH4iOSC8x58=
k8s.io/client-go v0.20.0-rc.0 h1:NsVnQ5pl1kXr8dEGl19oL0YJs9TW5pzPyQinoshhLxI=
k8s.io/client-go v0.20.0-rc.0/go.mod h1:XSSzw/FlNeM1KZIk6IruvpcNCHHm9+YA5wOjwNQaZxc=
k8s.io/client-go v0.20.0 h1:Xlax8PKbZsjX4gFvNtt4F5MoJ1V5prDvCuoq9B7iax0=
k8s.io/client-go v0.20.0/go.mod h1:4KWh/g+Ocd8KkCwKF8vUNnmqgv+EVnQDK4MBF4oB5tY=
k8s.io/code-generator v0.18.2/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc=
k8s.io/component-base v0.18.2/go.mod h1:kqLlMuhJNHQ9lz8Z7V5bxUUtjFZnrypArGl58gmDfUM=
k8s.io/component-base v0.20.0-rc.0 h1:thrpVCggO7d5ll043IxeFlDuticyys7GznqbMsf4r0U=
k8s.io/component-base v0.20.0-rc.0/go.mod h1:/JiF3VSZ7iZsNd90hniXeR++pVz401+0OL68CvANgb4=
k8s.io/component-base v0.20.0 h1:BXGL8iitIQD+0NgW49UsM7MraNUUGDU3FBmrfUAtmVQ=
k8s.io/component-base v0.20.0/go.mod h1:wKPj+RHnAr8LW2EIBIK7AxOHPde4gme2lzXwVSoRXeA=
k8s.io/cri-api v0.17.3/go.mod h1:X1sbHmuXhwaHs9xxYffLqJogVsnI+f6cPRcgPel7ywM=
k8s.io/cri-api v0.20.0-rc.0 h1:zfIloiv78L7EVcOqDZo8DANqyaY/ux95aQf8gpthEW4=
k8s.io/cri-api v0.20.0-rc.0/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI=
k8s.io/cri-api v0.20.0 h1:NIbGU0wmC2d2Evuec8rDjOVel3sOi371fiGKW+QfOdI=
k8s.io/cri-api v0.20.0/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20191108084044-e500ee069b5c/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
@ -1466,8 +1466,8 @@ k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C
k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E=
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd h1:sOHNzJIkytDF6qadMNKhhDRpc6ODik8lVC6nOur7B2c=
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM=
k8s.io/kubelet v0.20.0-rc.0 h1:m6cVb0R9mklAMtdFW2O6t6dxiLs63oYwwJouVLA86GE=
k8s.io/kubelet v0.20.0-rc.0/go.mod h1:e4k43iLzB1lecA87HUas6lVLslQTfFFFaIev7bh8mVw=
k8s.io/kubelet v0.20.0 h1:vtQMgZ7B79vCUyEpoij2Oy6UmcJx0/D2lNXfViVTBMg=
k8s.io/kubelet v0.20.0/go.mod h1:lMdjO1NA+JZXSYtxb48pQmNERmC+vVIXIYkJIugVhl0=
k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
k8s.io/utils v0.0.0-20191030222137-2b95a09bc58d/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=

View File

@ -57,7 +57,7 @@ kind: TalosControlPlane
metadata:
name: talos-e2e-{{TAG}}-aws-controlplane
spec:
version: v1.20.0-rc.0
version: v1.20.0
replicas: 3
infrastructureTemplate:
kind: AWSMachineTemplate
@ -111,7 +111,7 @@ spec:
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
kind: AWSMachineTemplate
name: talos-e2e-{{TAG}}-aws-workers
version: 1.20.0-rc.0
version: 1.20.0
---
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
kind: AWSMachineTemplate

View File

@ -44,7 +44,7 @@ kind: TalosControlPlane
metadata:
name: talos-e2e-{{TAG}}-gcp-controlplane
spec:
version: v1.20.0-rc.0
version: v1.20.0
replicas: 3
infrastructureTemplate:
kind: GCPMachineTemplate
@ -102,7 +102,7 @@ spec:
kind: GCPMachineTemplate
name: talos-e2e-{{TAG}}-gcp-workers
namespace: default
version: 1.20.0-rc.0
version: 1.20.0
---
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
kind: GCPMachineTemplate

View File

@ -73,7 +73,7 @@ const (
previousK8sVersion = "1.19.0"
stableK8sVersion = "1.19.4"
currentK8sVersion = "1.20.0-rc.0"
currentK8sVersion = "1.20.0"
)
var (

View File

@ -185,7 +185,7 @@ const (
KubeletBootstrapKubeconfig = "/etc/kubernetes/bootstrap-kubeconfig"
// DefaultKubernetesVersion is the default target version of the control plane.
DefaultKubernetesVersion = "1.20.0-rc.0"
DefaultKubernetesVersion = "1.20.0"
// DefaultControlPlanePort is the default port to use for the control plane.
DefaultControlPlanePort = 6443

View File

@ -94,7 +94,7 @@ talosctl cluster create [flags]
--initrd-path string the uncompressed kernel image to use (default "_out/initramfs-${ARCH}.xz")
-i, --input-dir string location of pre-generated config files
--install-image string the installer image to use (default "ghcr.io/talos-systems/installer:latest")
--kubernetes-version string desired kubernetes version to run (default "1.20.0-rc.0")
--kubernetes-version string desired kubernetes version to run (default "1.20.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)
@ -1473,7 +1473,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.20.0-rc.0")
--to string the Kubernetes control plane version to upgrade to (default "1.20.0")
```
### Options inherited from parent commands

View File

@ -285,7 +285,7 @@ Examples:
``` yaml
kubelet:
image: ghcr.io/talos-systems/kubelet:v1.20.0-rc.0 # The `image` field is an optional reference to an alternative kubelet image.
image: ghcr.io/talos-systems/kubelet:v1.20.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
@ -822,7 +822,7 @@ Examples:
``` yaml
apiServer:
image: k8s.gcr.io/kube-apiserver-amd64:v1.20.0-rc.0 # The container image used in the API server manifest.
image: k8s.gcr.io/kube-apiserver-amd64:v1.20.0 # The container image used in the API server manifest.
# Extra arguments to supply to the API server.
extraArgs:
--feature-gates: ServerSideApply=true
@ -854,7 +854,7 @@ Examples:
``` yaml
controllerManager:
image: k8s.gcr.io/kube-controller-manager-amd64:v1.20.0-rc.0 # The container image used in the controller manager manifest.
image: k8s.gcr.io/kube-controller-manager-amd64:v1.20.0 # The container image used in the controller manager manifest.
# Extra arguments to supply to the controller manager.
extraArgs:
--feature-gates: ServerSideApply=true
@ -881,7 +881,7 @@ Examples:
``` yaml
proxy:
image: k8s.gcr.io/kube-proxy-amd64:v1.20.0-rc.0 # The container image used in the kube-proxy manifest.
image: k8s.gcr.io/kube-proxy-amd64:v1.20.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:
@ -909,7 +909,7 @@ Examples:
``` yaml
scheduler:
image: k8s.gcr.io/kube-scheduler-amd64:v1.20.0-rc.0 # The container image used in the scheduler manifest.
image: k8s.gcr.io/kube-scheduler-amd64:v1.20.0 # The container image used in the scheduler manifest.
# Extra arguments to supply to the scheduler.
extraArgs:
--feature-gates: AllBeta=true
@ -1113,7 +1113,7 @@ Appears in:
``` yaml
image: ghcr.io/talos-systems/kubelet:v1.20.0-rc.0 # The `image` field is an optional reference to an alternative kubelet image.
image: ghcr.io/talos-systems/kubelet:v1.20.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
@ -1145,7 +1145,7 @@ Examples:
``` yaml
image: ghcr.io/talos-systems/kubelet:v1.20.0-rc.0
image: ghcr.io/talos-systems/kubelet:v1.20.0
```
@ -1855,7 +1855,7 @@ Appears in:
``` yaml
image: k8s.gcr.io/kube-apiserver-amd64:v1.20.0-rc.0 # The container image used in the API server manifest.
image: k8s.gcr.io/kube-apiserver-amd64:v1.20.0 # The container image used in the API server manifest.
# Extra arguments to supply to the API server.
extraArgs:
--feature-gates: ServerSideApply=true
@ -1883,7 +1883,7 @@ Examples:
``` yaml
image: k8s.gcr.io/kube-apiserver-amd64:v1.20.0-rc.0
image: k8s.gcr.io/kube-apiserver-amd64:v1.20.0
```
@ -1931,7 +1931,7 @@ Appears in:
``` yaml
image: k8s.gcr.io/kube-controller-manager-amd64:v1.20.0-rc.0 # The container image used in the controller manager manifest.
image: k8s.gcr.io/kube-controller-manager-amd64:v1.20.0 # The container image used in the controller manager manifest.
# Extra arguments to supply to the controller manager.
extraArgs:
--feature-gates: ServerSideApply=true
@ -1954,7 +1954,7 @@ Examples:
``` yaml
image: k8s.gcr.io/kube-controller-manager-amd64:v1.20.0-rc.0
image: k8s.gcr.io/kube-controller-manager-amd64:v1.20.0
```
@ -1989,7 +1989,7 @@ Appears in:
``` yaml
image: k8s.gcr.io/kube-proxy-amd64:v1.20.0-rc.0 # The container image used in the kube-proxy manifest.
image: k8s.gcr.io/kube-proxy-amd64:v1.20.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:
@ -2013,7 +2013,7 @@ Examples:
``` yaml
image: k8s.gcr.io/kube-proxy-amd64:v1.20.0-rc.0
image: k8s.gcr.io/kube-proxy-amd64:v1.20.0
```
@ -2062,7 +2062,7 @@ Appears in:
``` yaml
image: k8s.gcr.io/kube-scheduler-amd64:v1.20.0-rc.0 # The container image used in the scheduler manifest.
image: k8s.gcr.io/kube-scheduler-amd64:v1.20.0 # The container image used in the scheduler manifest.
# Extra arguments to supply to the scheduler.
extraArgs:
--feature-gates: AllBeta=true
@ -2085,7 +2085,7 @@ Examples:
``` yaml
image: k8s.gcr.io/kube-scheduler-amd64:v1.20.0-rc.0
image: k8s.gcr.io/kube-scheduler-amd64:v1.20.0
```