Skip to content

Commit

Permalink
feat: update Kubernetes to 1.21.0 release
Browse files Browse the repository at this point in the history
See CHANGELOG:
https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.21.md

Closes #3329.

Signed-off-by: Alexey Palazhchenko <alexey.palazhchenko@gmail.com>
  • Loading branch information
AlekSi committed Apr 9, 2021
1 parent 30f687b commit 37a5edf
Show file tree
Hide file tree
Showing 8 changed files with 51 additions and 51 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,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-rc.0/bin/$(OPERATING_SYSTEM)/amd64/kubectl
KUBECTL_URL ?= https://storage.googleapis.com/kubernetes-release/release/v1.21.0/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
Expand Down
14 changes: 7 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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-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
k8s.io/api v0.21.0
k8s.io/apimachinery v0.21.0
k8s.io/apiserver v0.21.0 // indirect
k8s.io/client-go v0.21.0
k8s.io/cri-api v0.21.0
k8s.io/kubectl v0.21.0
k8s.io/kubelet v0.21.0
)
42 changes: 21 additions & 21 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1610,28 +1610,28 @@ inet.af/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252/go.mod h1:zq+R+tLcdHugi7Jt+F
k8s.io/api v0.18.5/go.mod h1:tN+e/2nbdGKOAH55NMV8oGrMG+3uRlA9GaRfvnCCSNk=
k8s.io/api v0.19.0/go.mod h1:I1K45XlvTrDjmj5LoM5LuP/KYrhWbjUKT/SoPG0qTjw=
k8s.io/api v0.19.2/go.mod h1:IQpK0zFQ1xc5iNIQPqzgoOwuFugaYHK4iCknlAQP9nI=
k8s.io/api v0.21.0-rc.0 h1:t/kW96KdNJNamYNqxaxRirahK+FaWJQ6BJPbXm5Jb+o=
k8s.io/api v0.21.0-rc.0/go.mod h1:Dkc/ZauWJrgZhjOjeBgW89xZQiTBJA2RaBKYHXPsi2Y=
k8s.io/api v0.21.0 h1:gu5iGF4V6tfVCQ/R+8Hc0h7H1JuEhzyEi9S4R5LM8+Y=
k8s.io/api v0.21.0/go.mod h1:+YbrhBBGgsxbF6o6Kj4KJPJnBmAKuXDeS3E18bgHNVU=
k8s.io/apimachinery v0.18.5/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko=
k8s.io/apimachinery v0.19.0/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA=
k8s.io/apimachinery v0.19.2/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA=
k8s.io/apimachinery v0.21.0-rc.0 h1:m9dyzHb8QZAHOZKIz2SiabSif1oLsfgrnwiago/9xJA=
k8s.io/apimachinery v0.21.0-rc.0/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY=
k8s.io/apiserver v0.21.0-rc.0 h1:Ecvg4oAoQn5dK8V7W0TQIQqA4r+B/DH83HKSY4SuMSs=
k8s.io/apiserver v0.21.0-rc.0/go.mod h1:QlW7+1CZTZtAcKvJ34/n4DIb8sC93FeQpkd1KSU+Sok=
k8s.io/cli-runtime v0.21.0-rc.0 h1:M2cLtWR/LvuSSK8uhdTppcjyd/tqi3Dz5ZiOVfrhDHE=
k8s.io/cli-runtime v0.21.0-rc.0/go.mod h1:Gp9Njd5Z9IayPHKL8AKVVMrdzHrMHN+WnGMHYC7Lsds=
k8s.io/apimachinery v0.21.0 h1:3Fx+41if+IRavNcKOz09FwEXDBG6ORh6iMsTSelhkMA=
k8s.io/apimachinery v0.21.0/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY=
k8s.io/apiserver v0.21.0 h1:1hWMfsz+cXxB77k6/y0XxWxwl6l9OF26PC9QneUVn1Q=
k8s.io/apiserver v0.21.0/go.mod h1:w2YSn4/WIwYuxG5zJmcqtRdtqgW/J2JRgFAqps3bBpg=
k8s.io/cli-runtime v0.21.0 h1:/V2Kkxtf6x5NI2z+Sd/mIrq4FQyQ8jzZAUD6N5RnN7Y=
k8s.io/cli-runtime v0.21.0/go.mod h1:XoaHP93mGPF37MkLbjGVYqg3S1MnsFdKtiA/RZzzxOo=
k8s.io/client-go v0.18.5/go.mod h1:EsiD+7Fx+bRckKWZXnAXRKKetm1WuzPagH4iOSC8x58=
k8s.io/client-go v0.19.0/go.mod h1:H9E/VT95blcFQnlyShFgnFT9ZnJOAceiUHM3MlRC+mU=
k8s.io/client-go v0.21.0-rc.0 h1:lsPZHT1ZniXJcwg2udlaTOhAT8wf7BE0rn9Vj0+LWMA=
k8s.io/client-go v0.21.0-rc.0/go.mod h1:zU5HY/bSOKH3YOqoge9nFvICgrpeSdJu8DQ4fkjKIZk=
k8s.io/code-generator v0.21.0-rc.0/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q=
k8s.io/component-base v0.21.0-rc.0 h1:8YgFPDsIhRx7zCOxikZn77nYRnwxrc9aMiuQDJtK1+g=
k8s.io/component-base v0.21.0-rc.0/go.mod h1:XlP0bM7QJFWRGZYPc5NmphkvsYQ+o7804HWH3GTGjDY=
k8s.io/component-helpers v0.21.0-rc.0/go.mod h1:A8RfzdPEZoysfI5C0RExdjy7Zy/RZET3tcUmt7BMWdc=
k8s.io/client-go v0.21.0 h1:n0zzzJsAQmJngpC0IhgFcApZyoGXPrDIAD601HD09ag=
k8s.io/client-go v0.21.0/go.mod h1:nNBytTF9qPFDEhoqgEPaarobC8QPae13bElIVHzIglA=
k8s.io/code-generator v0.21.0/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q=
k8s.io/component-base v0.21.0 h1:tLLGp4BBjQaCpS/KiuWh7m2xqvAdsxLm4ATxHSe5Zpg=
k8s.io/component-base v0.21.0/go.mod h1:qvtjz6X0USWXbgmbfXR+Agik4RZ3jv2Bgr5QnZzdPYw=
k8s.io/component-helpers v0.21.0/go.mod h1:tezqefP7lxfvJyR+0a+6QtVrkZ/wIkyMLK4WcQ3Cj8U=
k8s.io/cri-api v0.17.3/go.mod h1:X1sbHmuXhwaHs9xxYffLqJogVsnI+f6cPRcgPel7ywM=
k8s.io/cri-api v0.21.0-rc.0 h1:v8U6Q+ytQnIs00ore07Xcr/nLwoun+HMcDaTlWzPdEA=
k8s.io/cri-api v0.21.0-rc.0/go.mod h1:nJbXlTpXwYCYuGMR7v3PQb1Du4WOGj2I9085xMVjr3I=
k8s.io/cri-api v0.21.0 h1:BxSMDXDuNE+Cv9CMenzQBn5SXYBTid/fhLetjI2KK14=
k8s.io/cri-api v0.21.0/go.mod h1:nJbXlTpXwYCYuGMR7v3PQb1Du4WOGj2I9085xMVjr3I=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
Expand All @@ -1648,12 +1648,12 @@ k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod h1:GRQhZsXIAJ1xR0C
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o=
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 h1:vEx13qjvaZ4yfObSSXW7BrMc/KQBBT/Jyee8XtLf4x0=
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE=
k8s.io/kubectl v0.21.0-rc.0 h1:UDHfpjRunMTqSyRR8GC7ywZ1ylmM2CpXkqRPqCPTXwk=
k8s.io/kubectl v0.21.0-rc.0/go.mod h1:eOKzb5p2/9pNzt2TQpVSzfB/41W6ZMm0JbJEIvyH08U=
k8s.io/kubelet v0.21.0-rc.0 h1:rtURGFVdVC3HhaoFcjWEUvYvrzkZNsEwuR82fPQpwZc=
k8s.io/kubelet v0.21.0-rc.0/go.mod h1:wNcXzTVpecPLZq0/4Ns21YMDI8ni9Sr+ifCaQom+z+8=
k8s.io/kubectl v0.21.0 h1:WZXlnG/yjcE4LWO2g6ULjFxtzK6H1TKzsfaBFuVIhNg=
k8s.io/kubectl v0.21.0/go.mod h1:EU37NukZRXn1TpAkMUoy8Z/B2u6wjHDS4aInsDzVvks=
k8s.io/kubelet v0.21.0 h1:1VUfM5vKqLPlWFI0zee6fm9kwIZ/UEOGCodVFN+OZrg=
k8s.io/kubelet v0.21.0/go.mod h1:G5ZxMTVev9t4bhmsSxDAWhH6wXDYEVHVVFyYsw4laR4=
k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
k8s.io/metrics v0.21.0-rc.0/go.mod h1:iCF67TNbrhChr/eb99uHt0H1hE7Rd1EC2Ic/yknzIE4=
k8s.io/metrics v0.21.0/go.mod h1:L3Ji9EGPP1YBbfm9sPfEXSpnj8i24bfQbAFAsW0NueQ=
k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
k8s.io/utils v0.0.0-20200912215256-4140de9c8800/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
Expand Down
2 changes: 1 addition & 1 deletion hack/test/e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export TALOS_VERSION=v0.9
# Kubernetes

export KUBECONFIG="${TMP}/kubeconfig"
export K8S_VERSION=1.21.0-rc.0
export K8S_VERSION=1.21.0

# Sonobuoy

Expand Down
6 changes: 3 additions & 3 deletions internal/integration/provision/upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ const (
stableRelease = "v0.9.1" // 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-rc.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" // next k8s version being tested
)

var defaultNameservers = []net.IP{net.ParseIP("8.8.8.8"), net.ParseIP("1.1.1.1")}
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 @@ -190,7 +190,7 @@ const (
SystemKubeletPKIDir = "/system/secrets/kubelet"

// DefaultKubernetesVersion is the default target version of the control plane.
DefaultKubernetesVersion = "1.21.0-rc.0"
DefaultKubernetesVersion = "1.21.0"

// 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.10/Reference/cli.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,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-rc.0")
--kubernetes-version string desired kubernetes version to run (default "1.21.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)
Expand Down Expand Up @@ -1958,7 +1958,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-rc.0")
--to string the Kubernetes control plane version to upgrade to (default "1.21.0")
```

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

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

``` yaml
apiServer:
image: k8s.gcr.io/kube-apiserver:v1.21.0-rc.0 # The container image used in the API server manifest.
image: k8s.gcr.io/kube-apiserver:v1.21.0 # 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 @@ -980,7 +980,7 @@ Examples:

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

``` yaml
proxy:
image: k8s.gcr.io/kube-proxy:v1.21.0-rc.0 # The container image used in the kube-proxy manifest.
image: k8s.gcr.io/kube-proxy:v1.21.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:
Expand Down Expand Up @@ -1035,7 +1035,7 @@ Examples:

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


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


``` yaml
image: ghcr.io/talos-systems/kubelet:v1.21.0-rc.0
image: ghcr.io/talos-systems/kubelet:v1.21.0
```


Expand Down Expand Up @@ -2297,7 +2297,7 @@ Appears in:
``` yaml
image: k8s.gcr.io/kube-apiserver:v1.21.0-rc.0 # The container image used in the API server manifest.
image: k8s.gcr.io/kube-apiserver:v1.21.0 # 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 @@ -2325,7 +2325,7 @@ Examples:
``` yaml
image: k8s.gcr.io/kube-apiserver:v1.21.0-rc.0
image: k8s.gcr.io/kube-apiserver:v1.21.0
```
Expand Down Expand Up @@ -2386,7 +2386,7 @@ Appears in:
``` yaml
image: k8s.gcr.io/kube-controller-manager:v1.21.0-rc.0 # The container image used in the controller manager manifest.
image: k8s.gcr.io/kube-controller-manager:v1.21.0 # The container image used in the controller manager manifest.
# Extra arguments to supply to the controller manager.
extraArgs:
feature-gates: ServerSideApply=true
Expand All @@ -2409,7 +2409,7 @@ Examples:
``` yaml
image: k8s.gcr.io/kube-controller-manager:v1.21.0-rc.0
image: k8s.gcr.io/kube-controller-manager:v1.21.0
```
Expand Down Expand Up @@ -2457,7 +2457,7 @@ Appears in:
``` yaml
image: k8s.gcr.io/kube-proxy:v1.21.0-rc.0 # The container image used in the kube-proxy manifest.
image: k8s.gcr.io/kube-proxy:v1.21.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:
Expand Down Expand Up @@ -2504,7 +2504,7 @@ Examples:
``` yaml
image: k8s.gcr.io/kube-proxy:v1.21.0-rc.0
image: k8s.gcr.io/kube-proxy:v1.21.0
```
Expand Down Expand Up @@ -2553,7 +2553,7 @@ Appears in:
``` yaml
image: k8s.gcr.io/kube-scheduler:v1.21.0-rc.0 # The container image used in the scheduler manifest.
image: k8s.gcr.io/kube-scheduler:v1.21.0 # The container image used in the scheduler manifest.
# Extra arguments to supply to the scheduler.
extraArgs:
feature-gates: AllBeta=true
Expand All @@ -2576,7 +2576,7 @@ Examples:
``` yaml
image: k8s.gcr.io/kube-scheduler:v1.21.0-rc.0
image: k8s.gcr.io/kube-scheduler:v1.21.0
```
Expand Down

0 comments on commit 37a5edf

Please sign in to comment.