Merge pull request #166 from mumoshu/k8s-1.5.1

Kubernetes v1.5.1

Author: mumoshu

config/config.go

@@ -70,7 +70,7 @@ func NewDefaultCluster() *Cluster {
 			ClusterName:        "kubernetes",
 			VPCCIDR:            "10.0.0.0/16",
 			ReleaseChannel:     "stable",
-			K8sVer:             "v1.4.6_coreos.0",
+			K8sVer:             "v1.5.1_coreos.0",
 			HyperkubeImageRepo: "quay.io/coreos/hyperkube",
 			AWSCliImageRepo:    "quay.io/coreos/awscli",
 			AWSCliTag:          "master",

config/templates/cloud-config-controller

@@ -552,6 +552,7 @@ write_files:
           {{ end }}
           - --advertise-address=$private_ipv4
           - --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota
+          - --anonymous-auth=false
           - --tls-cert-file=/etc/kubernetes/ssl/apiserver.pem
           - --tls-private-key-file=/etc/kubernetes/ssl/apiserver-key.pem
           - --client-ca-file=/etc/kubernetes/ssl/ca.pem

config/templates/cluster.yaml

@@ -192,7 +192,7 @@ controller:
 #tlsCertDurationDays: 365
 
 # Version of hyperkube image to use. This is the tag for the hyperkube image repository.
-# kubernetesVersion: v1.4.6_coreos.0
+# kubernetesVersion: v1.5.1_coreos.0
 
 # Hyperkube image repository to use.
 # hyperkubeImageRepo: quay.io/coreos/hyperkube

contrib/bump-version

@@ -6,11 +6,11 @@
 
 if [ $# -ne 1 ] || [ `expr $1 : ".*_.*"` == 0 ]; then
     echo "USAGE: $0 <target-version>"
-    echo "  example: $0 'v1.4.6_coreos.0'"
+    echo "  example: $0 'v1.5.1_coreos.0'"
     exit 1
 fi
 
-CURRENT_VERSION=${CURRENT_VERSION:-"v1.4.6_coreos.0"}
+CURRENT_VERSION=${CURRENT_VERSION:-"v1.5.1_coreos.0"}
 TARGET_VERSION=${1}
 
 CURRENT_VERSION_BASE=${CURRENT_VERSION%%_*}
@@ -34,4 +34,4 @@ for i in "${TRACKED[@]}"; do
         sed -i "s/${CURRENT_VERSION_SEMVER}/${TARGET_VERSION_SEMVER}/g" $i
         sed -i "s/${CURRENT_VERSION_BASE}/${TARGET_VERSION_BASE}/g" $i
     fi
-done
+done

e2e/kubernetes/Dockerfile

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

e2e/kubernetes/Makefile

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

e2e/kubernetes/README.md

@@ -0,0 +1 @@
+`DOCKER_REPO=... make build publish` to build and then push the docker image with the latest, pre-built Kubernetes E2E test suite.

e2e/kubernetes/conformance.sh

@@ -25,4 +25,4 @@ fi
 
 FOCUS=${FOCUS:-\[Conformance\]}
 
-go run hack/e2e.go -v --test -check_version_skew=false -check_node_count=true --test_args="--ginkgo.focus=$FOCUS"
+go run hack/e2e.go -v --test -check_version_skew=false --test_args="--ginkgo.focus=$FOCUS"