Merge pull request #185 from aaronlevy/v1.4.6

V1.4.6

Author: aaronlevy

Makefile

@@ -39,11 +39,10 @@ conformance-%: clean all
 	@sleep 30 # Give addons a little time to start
 	@cd hack/$*-node && ./conformance-test.sh
 
-#TODO(aaron): Prompt because this is destructive
 #TODO(aaron): the k8s.io/client-go upstream package is a symlink with relative path. Making note because we change symlink path.
 # This will naively try and create a vendor dir from a k8s release
 # USE: make vendor VENDOR_VERSION=vX.Y.Z
-VENDOR_VERSION = v1.4.5+coreos.0
+VENDOR_VERSION = v1.4.6+coreos.0
 vendor:
 	@echo "Creating k8s vendor for: $(VENDOR_VERSION)"
 	@rm -rf vendor

hack/multi-node/user-data.sample

@@ -26,7 +26,7 @@ coreos:
         [Service]
         EnvironmentFile=/etc/environment
         Environment=KUBELET_ACI=quay.io/coreos/hyperkube
-        Environment=KUBELET_VERSION=v1.4.5_coreos.0
+        Environment=KUBELET_VERSION=v1.4.6_coreos.0
         ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests
         ExecStartPre=/bin/mkdir -p /srv/kubernetes/manifests
         ExecStartPre=/bin/mkdir -p /etc/kubernetes/checkpoint-secrets

hack/quickstart/init-master.sh

@@ -111,7 +111,7 @@ if [ "${REMOTE_HOST}" != "local" ]; then
 
     # Copy self to remote host so script can be executed in "local" mode
     scp -i ${IDENT} -P ${REMOTE_PORT} ${SSH_OPTS} ${BASH_SOURCE[0]} core@${REMOTE_HOST}:/home/core/init-master.sh
-    ssh -i ${IDENT} -p ${REMOTE_PORT} ${SSH_OPTS} core@${REMOTE_HOST} "sudo /home/core/init-master.sh local"
+    ssh -i ${IDENT} -p ${REMOTE_PORT} ${SSH_OPTS} core@${REMOTE_HOST} "sudo BOOTKUBE_REPO=${BOOTKUBE_REPO} BOOTKUBE_VERSION=${BOOTKUBE_VERSION} /home/core/init-master.sh local"
 
     # Copy assets from remote host to a local directory. These can be used to launch additional nodes & contain TLS assets
     mkdir ${CLUSTER_DIR}

hack/single-node/user-data.sample

@@ -27,7 +27,7 @@ coreos:
         [Service]
         EnvironmentFile=/etc/environment
         Environment=KUBELET_ACI=quay.io/coreos/hyperkube
-        Environment=KUBELET_VERSION=v1.4.5_coreos.0
+        Environment=KUBELET_VERSION=v1.4.6_coreos.0
         ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests
         ExecStartPre=/bin/mkdir -p /srv/kubernetes/manifests
         ExecStartPre=/bin/mkdir -p /etc/kubernetes/checkpoint-secrets

hack/tests/conformance-gce.sh

@@ -10,11 +10,10 @@ set -euo pipefail
 #  - rkt is available on the host
 #
 # REQUIRED ENV VARS:
-#  - $BUILD_ROOT: environment variable is set and contains a checkout of bootkube at $BUILD_ROOT/bootkube
-#  - $KEY_FILE:   environment variable is set as path to GCE service account keyfile
+#  - $BUILD_ROOT: contains a checkout of bootkube at $BUILD_ROOT/bootkube
+#  - $KEY_FILE:   path to GCE service account keyfile
 #
 # OPTIONAL ENV VARS:
-#  - $WORKER_COUNT:     number of worker machines to launch. Default 4
 #  - $BOOTKUBE_REPO:    container repo to use to launch bootkube. Default to value in quickstart/init-master.sh
 #  - $BOOTKUBE_VERSION: container version to use to launch bootkube. Default to value in quickstart/init-master.sh
 #  - $COREOS_VERSION:   CoreOS image version.
@@ -28,10 +27,10 @@ set -euo pipefail
 #     - Use the quickstart init-worker.sh script to join node to kubernetes cluster
 #   - Run conformance tests against the launched cluster
 #
-WORKER_COUNT=4
 BOOTKUBE_REPO=${BOOTKUBE_REPO:-}
 BOOTKUBE_VERSION=${BOOTKUBE_VERSION:-}
 COREOS_IMAGE=${COREOS_IMAGE:-'https://www.googleapis.com/compute/v1/projects/coreos-cloud/global/images/coreos-stable-1122-2-0-v20160906'}
+WORKER_COUNT=4
 
 function cleanup {
     gcloud compute instances delete --quiet --zone us-central1-a bootkube-ci-m1 || true
@@ -106,5 +105,6 @@ else
         "--mount volume=keyfile,target=/build/keyfile " \
     )
 
-    sudo rkt run --insecure-options=image ${RKT_OPTS} docker://golang:1.6.3 --exec /bin/bash -- -c "IN_CONTAINER=true /build/bootkube/hack/tests/$(basename $0)"
+    sudo rkt run --insecure-options=image ${RKT_OPTS} docker://golang:1.6.3 --exec /bin/bash -- -c \
+        "IN_CONTAINER=true BOOTKUBE_REPO=${BOOTKUBE_REPO} BOOTKUBE_VERSION=${BOOTKUBE_VERSION} COREOS_IMAGE=${COREOS_IMAGE} /build/bootkube/hack/tests/$(basename $0)"
 fi

hack/tests/conformance-test.sh

@@ -2,7 +2,7 @@
 set -euo pipefail
 
 CONFORMANCE_REPO=${CONFORMANCE_REPO:-github.com/coreos/kubernetes}
-CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.4.5+coreos.0}
+CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.4.6+coreos.0}
 
 usage() {
     echo "USAGE:"

pkg/asset/internal/templates.go

@@ -34,7 +34,7 @@ spec:
     spec:
       containers:
       - name: kubelet
-        image: quay.io/coreos/hyperkube:v1.4.5_coreos.0
+        image: quay.io/coreos/hyperkube:v1.4.6_coreos.0
         command:
         - /nsenter
         - --target=1
@@ -124,7 +124,7 @@ spec:
       hostNetwork: true
       containers:
       - name: kube-apiserver
-        image: quay.io/coreos/hyperkube:v1.4.5_coreos.0
+        image: quay.io/coreos/hyperkube:v1.4.6_coreos.0
         command:
         - /hyperkube
         - apiserver
@@ -206,7 +206,7 @@ spec:
     spec:
       containers:
       - name: kube-controller-manager
-        image: quay.io/coreos/hyperkube:v1.4.5_coreos.0
+        image: quay.io/coreos/hyperkube:v1.4.6_coreos.0
         command:
         - ./hyperkube
         - controller-manager
@@ -244,7 +244,7 @@ spec:
     spec:
       containers:
       - name: kube-scheduler
-        image: quay.io/coreos/hyperkube:v1.4.5_coreos.0
+        image: quay.io/coreos/hyperkube:v1.4.6_coreos.0
         command:
         - ./hyperkube
         - scheduler
@@ -266,7 +266,7 @@ spec:
       hostNetwork: true
       containers:
       - name: kube-proxy
-        image: quay.io/coreos/hyperkube:v1.4.5_coreos.0
+        image: quay.io/coreos/hyperkube:v1.4.6_coreos.0
         command:
         - /hyperkube
         - proxy