Merge pull request #279 from aaronlevy/v1.5.2

V1.5.2

Author: aaronlevy

Makefile

@@ -54,7 +54,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.5.1+coreos.0
+VENDOR_VERSION = v1.5.2+coreos.0
 vendor:
 	@echo "Creating k8s vendor for: $(VENDOR_VERSION)"
 	@rm -rf vendor

hack/multi-node/user-data.sample

@@ -9,7 +9,7 @@ coreos:
         [Service]
         EnvironmentFile=/etc/environment
         Environment=KUBELET_ACI=quay.io/coreos/hyperkube
-        Environment=KUBELET_VERSION=v1.5.1_coreos.0
+        Environment=KUBELET_VERSION=v1.5.2_coreos.0
         Environment="RKT_OPTS=--volume var-lib-cni,kind=host,source=/var/lib/cni --mount volume=var-lib-cni,target=/var/lib/cni"
         ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests
         ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d

hack/single-node/user-data.sample

@@ -11,7 +11,7 @@ coreos:
         [Service]
         EnvironmentFile=/etc/environment
         Environment=KUBELET_ACI=quay.io/coreos/hyperkube
-        Environment=KUBELET_VERSION=v1.5.1_coreos.0
+        Environment=KUBELET_VERSION=v1.5.2_coreos.0
         Environment="RKT_OPTS=--volume var-lib-cni,kind=host,source=/var/lib/cni --mount volume=var-lib-cni,target=/var/lib/cni"
         ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests
         ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d

pkg/asset/internal/templates.go

@@ -35,7 +35,7 @@ spec:
     spec:
       containers:
       - name: kubelet
-        image: quay.io/coreos/hyperkube:v1.5.1_coreos.0
+        image: quay.io/coreos/hyperkube:v1.5.2_coreos.0
         command:
         - ./hyperkube
         - kubelet
@@ -132,7 +132,7 @@ spec:
       hostNetwork: true
       containers:
       - name: kube-apiserver
-        image: quay.io/coreos/hyperkube:v1.5.1_coreos.0
+        image: quay.io/coreos/hyperkube:v1.5.2_coreos.0
         command:
         - /usr/bin/flock
         - --exclusive
@@ -227,7 +227,7 @@ spec:
     spec:
       containers:
       - name: kube-controller-manager
-        image: quay.io/coreos/hyperkube:v1.5.1_coreos.0
+        image: quay.io/coreos/hyperkube:v1.5.2_coreos.0
         command:
         - ./hyperkube
         - controller-manager
@@ -271,7 +271,7 @@ spec:
     spec:
       containers:
       - name: kube-scheduler
-        image: quay.io/coreos/hyperkube:v1.5.1_coreos.0
+        image: quay.io/coreos/hyperkube:v1.5.2_coreos.0
         command:
         - ./hyperkube
         - scheduler
@@ -293,7 +293,7 @@ spec:
       hostNetwork: true
       containers:
       - name: kube-proxy
-        image: quay.io/coreos/hyperkube:v1.5.1_coreos.0
+        image: quay.io/coreos/hyperkube:v1.5.2_coreos.0
         command:
         - /hyperkube
         - proxy