Merge pull request #74 from mumoshu/kubernetes-1.4.6

Bump Kubernetes version to v1.4.6+coreos.0

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.5_coreos.0",
+		K8sVer:                   "v1.4.6_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.5_coreos.0
+# kubernetesVersion: v1.4.6_coreos.0
 
 # Hyperkube image repository to use.
 # hyperkubeImageRepo: quay.io/coreos/hyperkube

contrib/bump-version

@@ -0,0 +1,37 @@
+#!/bin/bash
+#
+# This script will go through each of the tracked files in this repo and update
+# the CURRENT_VERSION to the TARGET_VERSION. This is meant as a helper - but
+# probably should still double-check the changes are correct
+
+if [ $# -ne 1 ] || [ `expr $1 : ".*_.*"` == 0 ]; then
+    echo "USAGE: $0 <target-version>"
+    echo "  example: $0 'v1.4.6_coreos.0'"
+    exit 1
+fi
+
+CURRENT_VERSION=${CURRENT_VERSION:-"v1.4.6_coreos.0"}
+TARGET_VERSION=${1}
+
+CURRENT_VERSION_BASE=${CURRENT_VERSION%%_*}
+TARGET_VERSION_BASE=${TARGET_VERSION%%_*}
+
+CURRENT_VERSION_SEMVER=${CURRENT_VERSION/_/+}
+TARGET_VERSION_SEMVER=${TARGET_VERSION/_/+}
+
+GIT_ROOT=$(git rev-parse --show-toplevel)
+
+cd $GIT_ROOT
+TRACKED=($(git grep -F "${CURRENT_VERSION_BASE}"| awk -F : '{print $1}' | sort -u))
+for i in "${TRACKED[@]}"; do
+    echo Updating $i
+    if [ "$(uname -s)" == "Darwin" ]; then
+        sed -i "" "s/${CURRENT_VERSION}/${TARGET_VERSION}/g" $i
+        sed -i "" "s/${CURRENT_VERSION_SEMVER}/${TARGET_VERSION_SEMVER}/g" $i
+        sed -i "" "s/${CURRENT_VERSION_BASE}/${TARGET_VERSION_BASE}/g" $i
+    else
+        sed -i "s/${CURRENT_VERSION}/${TARGET_VERSION}/g" $i
+        sed -i "s/${CURRENT_VERSION_SEMVER}/${TARGET_VERSION_SEMVER}/g" $i
+        sed -i "s/${CURRENT_VERSION_BASE}/${TARGET_VERSION_BASE}/g" $i
+    fi
+done

e2e/kubernetes/Dockerfile

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

e2e/kubernetes/Makefile

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