Merge pull request #9 in RUN/kube-aws from feature/bump-kube-to-1.6.4…

… to hcom-flavour

* commit '28b893f91b55ad07545bcf7c871bccad7be1bbd9':
  @noissue Bump kubbe/coros version

contrib/bump-version

@@ -6,11 +6,11 @@
 
 if [ $# -ne 1 ] || [ `expr $1 : ".*_.*"` == 0 ]; then
     echo "USAGE: $0 <target-version>"
-    echo "  example: $0 'v1.6.3_coreos.0'"
+    echo "  example: $0 'v1.6.4_coreos.0'"
     exit 1
 fi
 
-CURRENT_VERSION=${CURRENT_VERSION:-"v1.6.3_coreos.0"}
+CURRENT_VERSION=${CURRENT_VERSION:-"v1.6.4_coreos.0"}
 TARGET_VERSION=${1}
 
 CURRENT_VERSION_BASE=${CURRENT_VERSION%%_*}

core/controlplane/config/config.go

@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	k8sVer = "v1.6.3_coreos.0"
+	k8sVer = "v1.6.4_coreos.0"
 
 	credentialsDir = "credentials"
 	userDataDir    = "userdata"

core/controlplane/config/templates/cluster.yaml

@@ -974,7 +974,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.6.3_coreos.0
+# kubernetesVersion: v1.6.4_coreos.0
 
 # Hyperkube image repository to use.
 # hyperkubeImage:

e2e/kubernetes/Dockerfile

@@ -1,6 +1,6 @@
 FROM golang:1.7.1
 
-ARG KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.6.3+coreos.0}
+ARG KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.6.4+coreos.0}
 
 RUN apt-get update && \
     apt-get install -y rsync && \

e2e/kubernetes/Makefile

@@ -1,4 +1,4 @@
-KUBERNETES_VERSION ?= v1.6.3+coreos.0
+KUBERNETES_VERSION ?= v1.6.4+coreos.0
 DOCKER_REPO ?=
 DOCKER_TAG ?= $(DOCKER_REPO)kube-e2e:$(KUBERNETES_VERSION)
 DOCKER_TAG_SANITIZED ?= $(shell echo $(DOCKER_TAG) | sed -e 's/+/_/')