Merge pull request #226 from aaronlevy/v147

K8s v1.4.7

Author: aaronlevy

Makefile

@@ -42,7 +42,7 @@ conformance-%: clean all
 #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.6+coreos.0
+VENDOR_VERSION = v1.4.7+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.6_coreos.0
+        Environment=KUBELET_VERSION=v1.4.7_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/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.6_coreos.0
+        Environment=KUBELET_VERSION=v1.4.7_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-test.sh

@@ -2,7 +2,7 @@
 set -euo pipefail
 
 CONFORMANCE_REPO=${CONFORMANCE_REPO:-github.com/coreos/kubernetes}
-CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.4.6+coreos.0}
+CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.4.7+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.6_coreos.0
+        image: quay.io/coreos/hyperkube:v1.4.7_coreos.0
         command:
         - /nsenter
         - --target=1
@@ -124,7 +124,7 @@ spec:
       hostNetwork: true
       containers:
       - name: kube-apiserver
-        image: quay.io/coreos/hyperkube:v1.4.6_coreos.0
+        image: quay.io/coreos/hyperkube:v1.4.7_coreos.0
         command:
         - /hyperkube
         - apiserver
@@ -208,7 +208,7 @@ spec:
     spec:
       containers:
       - name: kube-controller-manager
-        image: quay.io/coreos/hyperkube:v1.4.6_coreos.0
+        image: quay.io/coreos/hyperkube:v1.4.7_coreos.0
         command:
         - ./hyperkube
         - controller-manager
@@ -249,7 +249,7 @@ spec:
     spec:
       containers:
       - name: kube-scheduler
-        image: quay.io/coreos/hyperkube:v1.4.6_coreos.0
+        image: quay.io/coreos/hyperkube:v1.4.7_coreos.0
         command:
         - ./hyperkube
         - scheduler
@@ -271,7 +271,7 @@ spec:
       hostNetwork: true
       containers:
       - name: kube-proxy
-        image: quay.io/coreos/hyperkube:v1.4.6_coreos.0
+        image: quay.io/coreos/hyperkube:v1.4.7_coreos.0
         command:
         - /hyperkube
         - proxy