Skip to content
This repository was archived by the owner on Sep 30, 2020. It is now read-only.

Commit 69ed6a7

Browse files
authored
Merge pull request #1861 from kubernetes-incubator/feature/kubernetes-upgrade
[v0.16.0] Bump Kubernetes version
2 parents 062740b + f30440d commit 69ed6a7

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

build

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ TAG=$(git describe --exact-match --abbrev=0 --tags "${COMMIT}" 2> /dev/null || t
66
BRANCH=$(git branch | grep \* | cut -d ' ' -f2 | sed -e 's/[^a-zA-Z0-9+=._:/-]*//g' || true)
77
OUTPUT_PATH=${OUTPUT_PATH:-"bin/kube-aws"}
88
VERSION=""
9-
ETCD_VERSION="v3.4.3"
10-
KUBERNETES_VERSION="v1.16.7"
9+
ETCD_VERSION="v3.4.9"
10+
KUBERNETES_VERSION="v1.16.10"
1111

1212
if [ -z "$TAG" ]; then
1313
[[ -n "$BRANCH" ]] && VERSION="${BRANCH}/"

builtin/files/cluster.yaml.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,7 @@ worker:
748748
# # The version of etcd to be used.
749749
# # CAUTION: Increasing etcd version will permanently change the state of etcd and a cloud formation rollback, will not succeed due to etcd
750750
# being unable to downgrade.
751-
# version: v3.2.26
751+
# version: v3.4.9
752752
#
753753
# snapshot:
754754
# # Set to true to periodically take an etcd snapshot
@@ -1066,7 +1066,7 @@ worker:
10661066
# and pulling from quay or dockerhub is slow and you get many timeouts.
10671067

10681068
# Version of hyperkube image to use. This is the tag for the hyperkube image repository.
1069-
# kubernetesVersion: v1.11.3
1069+
# kubernetesVersion: v1.16.10
10701070

10711071
# Hyperkube image repository to use.
10721072
# hyperkubeImage:

0 commit comments

Comments
 (0)