Merge pull request #395 from aaronlevy/cherry-pick-1.5.5

Bump k8s version v1.5.5

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.4+coreos.0
+VENDOR_VERSION = v1.5.5+coreos.0
 ETCD_OPERATOR_VERSION = v0.2.1
 vendor:
 	@echo "Creating k8s vendor for: $(VENDOR_VERSION)"

hack/multi-node/user-data.sample

@@ -9,7 +9,7 @@ coreos:
         [Service]
         EnvironmentFile=/etc/environment
         Environment=KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
-        Environment=KUBELET_IMAGE_TAG=v1.5.4_coreos.0
+        Environment=KUBELET_IMAGE_TAG=v1.5.5_coreos.0
         Environment="RKT_RUN_ARGS=--uuid-file-save=/var/run/kubelet-pod.uuid \
           --volume var-lib-cni,kind=host,source=/var/lib/cni \
           --mount volume=var-lib-cni,target=/var/lib/cni"

hack/single-node/user-data.sample

@@ -17,7 +17,7 @@ coreos:
         [Service]
         EnvironmentFile=/etc/environment
         Environment=KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
-        Environment=KUBELET_IMAGE_TAG=v1.5.4_coreos.0
+        Environment=KUBELET_IMAGE_TAG=v1.5.5_coreos.0
         Environment="RKT_RUN_ARGS=--uuid-file-save=/var/run/kubelet-pod.uuid \
           --volume var-lib-cni,kind=host,source=/var/lib/cni \
           --mount volume=var-lib-cni,target=/var/lib/cni"

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.5.4+coreos.0}
+CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.5.5+coreos.0}
 
 usage() {
     echo "USAGE:"

pkg/asset/internal/templates.go

@@ -50,7 +50,7 @@ spec:
     spec:
       containers:
       - name: kubelet
-        image: quay.io/coreos/hyperkube:v1.5.4_coreos.0
+        image: quay.io/coreos/hyperkube:v1.5.5_coreos.0
         command:
         - ./hyperkube
         - kubelet
@@ -147,7 +147,7 @@ spec:
       hostNetwork: true
       containers:
       - name: kube-apiserver
-        image: quay.io/coreos/hyperkube:v1.5.4_coreos.0
+        image: quay.io/coreos/hyperkube:v1.5.5_coreos.0
         command:
         - /usr/bin/flock
         - --exclusive
@@ -291,7 +291,7 @@ spec:
         master: "true"
       containers:
       - name: kube-controller-manager
-        image: quay.io/coreos/hyperkube:v1.5.4_coreos.0
+        image: quay.io/coreos/hyperkube:v1.5.5_coreos.0
         command:
         - ./hyperkube
         - controller-manager
@@ -347,7 +347,7 @@ spec:
         master: "true"
       containers:
       - name: kube-scheduler
-        image: quay.io/coreos/hyperkube:v1.5.4_coreos.0
+        image: quay.io/coreos/hyperkube:v1.5.5_coreos.0
         command:
         - ./hyperkube
         - scheduler
@@ -380,7 +380,7 @@ spec:
       hostNetwork: true
       containers:
       - name: kube-proxy
-        image: quay.io/coreos/hyperkube:v1.5.4_coreos.0
+        image: quay.io/coreos/hyperkube:v1.5.5_coreos.0
         command:
         - /hyperkube
         - proxy