Merge pull request #996 from camilb/bump-kubernetes-version

Bump kubernetes version to 1.8.2.
kubernetes-retired · Nov 5, 2017 · 976e946 · 976e946
2 parents 44efb9d + f0045b9
commit 976e946
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/contrib/bump-version b/contrib/bump-version
@@ -6,12 +6,12 @@
 
 if [ $# -ne 1 ] || [ `expr $1 : ".*_.*"` == 0 ]; then
     echo "USAGE: $0 <target-version>"
-    echo "  example: $0 'v1.7.8_coreos.1'"
+    echo "  example: $0 'v1.8.2_coreos.0'"
     exit 1
 fi
 
 # the version needs to be published, see https://quay.io/repository/coreos/hyperkube?tag=latest&tab=tags
-CURRENT_VERSION=${CURRENT_VERSION:-"v1.7.8_coreos.1"}
+CURRENT_VERSION=${CURRENT_VERSION:-"v1.8.2_coreos.0"}
 TARGET_VERSION=${1}
 
 CURRENT_VERSION_BASE=${CURRENT_VERSION%%_*}

diff --git a/core/controlplane/config/config.go b/core/controlplane/config/config.go
@@ -29,7 +29,7 @@ import (
 )
 
 const (
-	k8sVer = "v1.7.8_coreos.1"
+	k8sVer = "v1.8.2_coreos.0"
 
 	credentialsDir = "credentials"
 	userDataDir    = "userdata"

diff --git a/core/controlplane/config/templates/cluster.yaml b/core/controlplane/config/templates/cluster.yaml
@@ -938,7 +938,7 @@ worker:
 # and pulling from quay or dockerhub is slow and you get many timeouts.
 
 # Version of hyperkube image to use. This is the tag for the hyperkube image repository.
-# kubernetesVersion: v1.7.8_coreos.1
+# kubernetesVersion: v1.8.2_coreos.0
 
 # Hyperkube image repository to use.
 # hyperkubeImage:

diff --git a/e2e/kubernetes/Dockerfile b/e2e/kubernetes/Dockerfile
@@ -1,6 +1,6 @@
 FROM golang:1.8.3
 
-ARG KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.7.8+coreos.1}
+ARG KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.8.2+coreos.0}
 
 RUN apt-get update && \
     apt-get install -y rsync && \

diff --git a/e2e/kubernetes/Makefile b/e2e/kubernetes/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION ?= v1.7.8+coreos.1
+KUBERNETES_VERSION ?= v1.8.2+coreos.0
 DOCKER_REPO ?=
 DOCKER_TAG ?= $(DOCKER_REPO)kube-e2e:$(KUBERNETES_VERSION)
 DOCKER_TAG_SANITIZED ?= $(shell echo $(DOCKER_TAG) | sed -e 's/+/_/')