Skip to content

Commit

Permalink
feat: update Kubernetes to 1.21.1
Browse files Browse the repository at this point in the history
  • Loading branch information
smira authored and talos-bot committed May 13, 2021
1 parent 9b1338d commit 76e38b7
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 26 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 ?=

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
export K8S_VERSION=1.21.1

# Sonobuoy

Expand Down
10 changes: 5 additions & 5 deletions internal/integration/provision/upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")}
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 @@ -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
Expand Down
4 changes: 2 additions & 2 deletions website/content/docs/v0.11/Reference/cli.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
30 changes: 15 additions & 15 deletions website/content/docs/v0.11/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 # 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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -1305,7 +1305,7 @@ Examples:


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


Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -2324,7 +2324,7 @@ Examples:
``` yaml
image: k8s.gcr.io/kube-apiserver:v1.21.0
image: k8s.gcr.io/kube-apiserver:v1.21.1
```
Expand Down Expand Up @@ -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
Expand All @@ -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
```
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -2503,7 +2503,7 @@ Examples:
``` yaml
image: k8s.gcr.io/kube-proxy:v1.21.0
image: k8s.gcr.io/kube-proxy:v1.21.1
```
Expand Down Expand Up @@ -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
Expand All @@ -2575,7 +2575,7 @@ Examples:
``` yaml
image: k8s.gcr.io/kube-scheduler:v1.21.0
image: k8s.gcr.io/kube-scheduler:v1.21.1
```
Expand Down

0 comments on commit 76e38b7

Please sign in to comment.