Skip to content

Commit

Permalink
feat: update Kubernetes to 1.20.2
Browse files Browse the repository at this point in the history
Minor point release, official changelog:

https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.20.md

Signed-off-by: Andrey Smirnov <smirnov.andrey@gmail.com>
  • Loading branch information
smira authored and talos-bot committed Jan 15, 2021
1 parent d515613 commit d71ac4c
Show file tree
Hide file tree
Showing 9 changed files with 45 additions and 45 deletions.
12 changes: 6 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,10 @@ require (
gopkg.in/fsnotify.v1 v1.4.7
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776
honnef.co/go/tools v0.0.1-2020.1.6 // indirect
k8s.io/api v0.20.1
k8s.io/apimachinery v0.20.1
k8s.io/apiserver v0.20.1
k8s.io/client-go v0.20.1
k8s.io/cri-api v0.20.1
k8s.io/kubelet v0.20.1
k8s.io/api v0.20.2
k8s.io/apimachinery v0.20.2
k8s.io/apiserver v0.20.2
k8s.io/client-go v0.20.2
k8s.io/cri-api v0.20.2
k8s.io/kubelet v0.20.2
)
28 changes: 14 additions & 14 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1386,8 +1386,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.1 h1:ud1c3W3YNzGd6ABJlbFfKXBKXO+1KdGfcgGGNgFR03E=
k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo=
k8s.io/api v0.20.2 h1:y/HR22XDZY3pniu9hIFDLpUCPq2w5eQ6aV/VFQ7uJMw=
k8s.io/api v0.20.2/go.mod h1:d7n6Ehyzx+S+cE3VhTGfVNNqtGc/oL9DCdYYahlurV8=
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=
Expand All @@ -1396,23 +1396,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.1 h1:LAhz8pKbgR8tUwn7boK+b2HZdt7MiTu2mkYtFMUjTRQ=
k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
k8s.io/apimachinery v0.20.2 h1:hFx6Sbt1oG0n6DZ+g4bFt5f6BoMkOjKWsQFu077M3Vg=
k8s.io/apimachinery v0.20.2/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
k8s.io/apiserver v0.18.2/go.mod h1:Xbh066NqrZO8cbsoenCwyDJ1OSi8Ag8I2lezeHxzwzw=
k8s.io/apiserver v0.20.1 h1:yEqdkxlnQbxi/3e74cp0X16h140fpvPrNnNRAJBDuBk=
k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU=
k8s.io/apiserver v0.20.2 h1:lGno2t3gcZnLtzsKH4oG0xA9/4GTiBzMO1DGp+K+Bak=
k8s.io/apiserver v0.20.2/go.mod h1:2nKd93WyMhZx4Hp3RfgH2K5PhwyTrprrkWYnI7id7jA=
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.1 h1:Qquik0xNFbK9aUG92pxHYsyfea5/RPO9o9bSywNor+M=
k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y=
k8s.io/client-go v0.20.2 h1:uuf+iIAbfnCSw8IGAv/Rg0giM+2bOzHLOsbbrwrdhNQ=
k8s.io/client-go v0.20.2/go.mod h1:kH5brqWqp7HDxUFKoEgiI4v8G1xzbe9giaCenUWJzgE=
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.1 h1:6OQaHr205NSl24t5wOF2IhdrlxZTWEZwuGlLvBgaeIg=
k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk=
k8s.io/component-base v0.20.2 h1:LMmu5I0pLtwjpp5009KLuMGFqSc2S2isGw8t1hpYKLE=
k8s.io/component-base v0.20.2/go.mod h1:pzFtCiwe/ASD0iV7ySMu8SYVJjCapNM9bjvk7ptpKh0=
k8s.io/cri-api v0.17.3/go.mod h1:X1sbHmuXhwaHs9xxYffLqJogVsnI+f6cPRcgPel7ywM=
k8s.io/cri-api v0.20.1 h1:b4l7SZ9+VPfIrrJnMXzm0HR9wAsHwHh9+QcmK31nQMI=
k8s.io/cri-api v0.20.1/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI=
k8s.io/cri-api v0.20.2 h1:GPwBRUF2dQvf7ZaXVUmHbmyYRDlxDuCBSfn/2wpccQk=
k8s.io/cri-api v0.20.2/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=
Expand All @@ -1431,8 +1431,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.1 h1:HfTFK95qWKMyY/UzT4C19/ke5pOlTp65z6mHiPIQ1Fc=
k8s.io/kubelet v0.20.1/go.mod h1:5zyqbuxkRJYcxNrh33VwHxd6T7HdqpuzpFldjgX8JMg=
k8s.io/kubelet v0.20.2 h1:TbOqhr5pN6GsGy798WnwiBAw1JIyZ5H4rugKf1q2jNw=
k8s.io/kubelet v0.20.2/go.mod h1:i441hnZtH2wUiDNqpXVZYaNCqEOBd2sM7x2mV0n7dJs=
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=
Expand Down
4 changes: 2 additions & 2 deletions hack/test/capi/cluster-aws.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ kind: TalosControlPlane
metadata:
name: talos-e2e-{{TAG}}-aws-controlplane
spec:
version: v1.20.1
version: v1.20.2
replicas: 3
infrastructureTemplate:
kind: AWSMachineTemplate
Expand Down Expand Up @@ -111,7 +111,7 @@ spec:
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
kind: AWSMachineTemplate
name: talos-e2e-{{TAG}}-aws-workers
version: 1.20.1
version: 1.20.2
---
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
kind: AWSMachineTemplate
Expand Down
4 changes: 2 additions & 2 deletions hack/test/capi/cluster-gcp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ kind: TalosControlPlane
metadata:
name: talos-e2e-{{TAG}}-gcp-controlplane
spec:
version: v1.20.1
version: v1.20.2
replicas: 3
infrastructureTemplate:
kind: GCPMachineTemplate
Expand Down Expand Up @@ -102,7 +102,7 @@ spec:
kind: GCPMachineTemplate
name: talos-e2e-{{TAG}}-gcp-workers
namespace: default
version: 1.20.1
version: 1.20.2
---
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
kind: GCPMachineTemplate
Expand Down
2 changes: 1 addition & 1 deletion internal/integration/provision/upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ const (

previousK8sVersion = "1.19.4"
stableK8sVersion = "1.20.1"
currentK8sVersion = "1.20.1"
currentK8sVersion = "1.20.2"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pkg/machinery/constants/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ const (
KubeletBootstrapKubeconfig = "/etc/kubernetes/bootstrap-kubeconfig"

// DefaultKubernetesVersion is the default target version of the control plane.
DefaultKubernetesVersion = "1.20.1"
DefaultKubernetesVersion = "1.20.2"

// DefaultControlPlanePort is the default port to use for the control plane.
DefaultControlPlanePort = 6443
Expand Down
4 changes: 2 additions & 2 deletions website/content/docs/v0.9/Introduction/quickstart.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ Verify that you can reach Kubernetes:
```bash
$ kubectl get nodes -o wide
NAME STATUS ROLES AGE VERSION INTERNAL-IP EXTERNAL-IP OS-IMAGE KERNEL-VERSION CONTAINER-RUNTIME
talos-default-master-1 Ready master 115s v1.20.1 10.5.0.2 <none> Talos (v0.9.0) <host kernel> containerd://1.4.3
talos-default-worker-1 Ready <none> 115s v1.20.1 10.5.0.3 <none> Talos (v0.9.0) <host kernel> containerd://1.4.3
talos-default-master-1 Ready master 115s v1.20.2 10.5.0.2 <none> Talos (v0.9.0) <host kernel> containerd://1.4.3
talos-default-worker-1 Ready <none> 115s v1.20.2 10.5.0.3 <none> Talos (v0.9.0) <host kernel> containerd://1.4.3
```

## Destroy the Cluster
Expand Down
4 changes: 2 additions & 2 deletions website/content/docs/v0.9/Reference/cli.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ talosctl cluster create [flags]
-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")
--iso-path string the ISO path to use for the initial boot (VM only)
--kubernetes-version string desired kubernetes version to run (default "1.20.1")
--kubernetes-version string desired kubernetes version to run (default "1.20.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)
Expand Down Expand Up @@ -1650,7 +1650,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.1")
--to string the Kubernetes control plane version to upgrade to (default "1.20.2")
```

### Options inherited from parent commands
Expand Down
30 changes: 15 additions & 15 deletions website/content/docs/v0.9/Reference/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ Examples:

``` yaml
kubelet:
image: ghcr.io/talos-systems/kubelet:v1.20.1 # The `image` field is an optional reference to an alternative kubelet image.
image: ghcr.io/talos-systems/kubelet:v1.20.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
Expand Down Expand Up @@ -851,7 +851,7 @@ Examples:

``` yaml
apiServer:
image: k8s.gcr.io/kube-apiserver-amd64:v1.20.1 # The container image used in the API server manifest.
image: k8s.gcr.io/kube-apiserver-amd64:v1.20.2 # The container image used in the API server manifest.
# Extra arguments to supply to the API server.
extraArgs:
--feature-gates: ServerSideApply=true
Expand Down Expand Up @@ -883,7 +883,7 @@ Examples:

``` yaml
controllerManager:
image: k8s.gcr.io/kube-controller-manager-amd64:v1.20.1 # The container image used in the controller manager manifest.
image: k8s.gcr.io/kube-controller-manager-amd64:v1.20.2 # The container image used in the controller manager manifest.
# Extra arguments to supply to the controller manager.
extraArgs:
--feature-gates: ServerSideApply=true
Expand All @@ -910,7 +910,7 @@ Examples:

``` yaml
proxy:
image: k8s.gcr.io/kube-proxy-amd64:v1.20.1 # The container image used in the kube-proxy manifest.
image: k8s.gcr.io/kube-proxy-amd64:v1.20.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:
Expand Down Expand Up @@ -938,7 +938,7 @@ Examples:

``` yaml
scheduler:
image: k8s.gcr.io/kube-scheduler-amd64:v1.20.1 # The container image used in the scheduler manifest.
image: k8s.gcr.io/kube-scheduler-amd64:v1.20.2 # The container image used in the scheduler manifest.
# Extra arguments to supply to the scheduler.
extraArgs:
--feature-gates: AllBeta=true
Expand Down Expand Up @@ -1142,7 +1142,7 @@ Appears in:


``` yaml
image: ghcr.io/talos-systems/kubelet:v1.20.1 # The `image` field is an optional reference to an alternative kubelet image.
image: ghcr.io/talos-systems/kubelet:v1.20.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
Expand Down Expand Up @@ -1174,7 +1174,7 @@ Examples:


``` yaml
image: ghcr.io/talos-systems/kubelet:v1.20.1
image: ghcr.io/talos-systems/kubelet:v1.20.2
```


Expand Down Expand Up @@ -1934,7 +1934,7 @@ Appears in:
``` yaml
image: k8s.gcr.io/kube-apiserver-amd64:v1.20.1 # The container image used in the API server manifest.
image: k8s.gcr.io/kube-apiserver-amd64:v1.20.2 # The container image used in the API server manifest.
# Extra arguments to supply to the API server.
extraArgs:
--feature-gates: ServerSideApply=true
Expand Down Expand Up @@ -1962,7 +1962,7 @@ Examples:
``` yaml
image: k8s.gcr.io/kube-apiserver-amd64:v1.20.1
image: k8s.gcr.io/kube-apiserver-amd64:v1.20.2
```
Expand Down Expand Up @@ -2010,7 +2010,7 @@ Appears in:
``` yaml
image: k8s.gcr.io/kube-controller-manager-amd64:v1.20.1 # The container image used in the controller manager manifest.
image: k8s.gcr.io/kube-controller-manager-amd64:v1.20.2 # The container image used in the controller manager manifest.
# Extra arguments to supply to the controller manager.
extraArgs:
--feature-gates: ServerSideApply=true
Expand All @@ -2033,7 +2033,7 @@ Examples:
``` yaml
image: k8s.gcr.io/kube-controller-manager-amd64:v1.20.1
image: k8s.gcr.io/kube-controller-manager-amd64:v1.20.2
```
Expand Down Expand Up @@ -2068,7 +2068,7 @@ Appears in:
``` yaml
image: k8s.gcr.io/kube-proxy-amd64:v1.20.1 # The container image used in the kube-proxy manifest.
image: k8s.gcr.io/kube-proxy-amd64:v1.20.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:
Expand All @@ -2092,7 +2092,7 @@ Examples:
``` yaml
image: k8s.gcr.io/kube-proxy-amd64:v1.20.1
image: k8s.gcr.io/kube-proxy-amd64:v1.20.2
```
Expand Down Expand Up @@ -2141,7 +2141,7 @@ Appears in:
``` yaml
image: k8s.gcr.io/kube-scheduler-amd64:v1.20.1 # The container image used in the scheduler manifest.
image: k8s.gcr.io/kube-scheduler-amd64:v1.20.2 # The container image used in the scheduler manifest.
# Extra arguments to supply to the scheduler.
extraArgs:
--feature-gates: AllBeta=true
Expand All @@ -2164,7 +2164,7 @@ Examples:
``` yaml
image: k8s.gcr.io/kube-scheduler-amd64:v1.20.1
image: k8s.gcr.io/kube-scheduler-amd64:v1.20.2
```
Expand Down

0 comments on commit d71ac4c

Please sign in to comment.