Merge pull request #20 from mumoshu/kubernetes-1.4.5

Bump Kubernetes version to 1.4.5+coreos.0

Author: mumoshu

config/config.go

@@ -43,7 +43,7 @@ func newDefaultCluster() *Cluster {
 		PodCIDR:                  "10.2.0.0/16",
 		ServiceCIDR:              "10.3.0.0/24",
 		DNSServiceIP:             "10.3.0.10",
-		K8sVer:                   "v1.4.3_coreos.0",
+		K8sVer:                   "v1.4.5_coreos.0",
 		HyperkubeImageRepo:       "quay.io/coreos/hyperkube",
 		TLSCADurationDays:        365 * 10,
 		TLSCertDurationDays:      365,

config/templates/cluster.yaml

@@ -143,7 +143,7 @@ kmsKeyArn: "{{.KMSKeyARN}}"
 #tlsCertDurationDays: 365
 
 # Version of hyperkube image to use. This is the tag for the hyperkube image repository.
-# kubernetesVersion: v1.4.3_coreos.0
+# kubernetesVersion: v1.4.5_coreos.0
 
 # Hyperkube image repository to use.
 # hyperkubeImageRepo: quay.io/coreos/hyperkube

e2e/kubernetes/Dockerfile

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

e2e/kubernetes/Makefile

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