Merge pull request #420 from aaronlevy/v161

Bump conformance + manifests to v1.6.1

Author: aaronlevy

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.5+coreos.0}
+CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.6.1+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.6.0_coreos.0
+        image: quay.io/coreos/hyperkube:v1.6.1_coreos.0
         command:
         - ./hyperkube
         - kubelet
@@ -147,7 +147,7 @@ spec:
       hostNetwork: true
       containers:
       - name: kube-apiserver
-        image: quay.io/coreos/hyperkube:v1.6.0_coreos.0
+        image: quay.io/coreos/hyperkube:v1.6.1_coreos.0
         command:
         - /usr/bin/flock
         - --exclusive
@@ -322,7 +322,7 @@ spec:
         master: "true"
       containers:
       - name: kube-controller-manager
-        image: quay.io/coreos/hyperkube:v1.6.0_coreos.0
+        image: quay.io/coreos/hyperkube:v1.6.1_coreos.0
         command:
         - ./hyperkube
         - controller-manager
@@ -384,7 +384,7 @@ spec:
         master: "true"
       containers:
       - name: kube-scheduler
-        image: quay.io/coreos/hyperkube:v1.6.0_coreos.0
+        image: quay.io/coreos/hyperkube:v1.6.1_coreos.0
         command:
         - ./hyperkube
         - scheduler
@@ -424,7 +424,7 @@ spec:
       hostNetwork: true
       containers:
       - name: kube-proxy
-        image: quay.io/coreos/hyperkube:v1.6.0_coreos.0
+        image: quay.io/coreos/hyperkube:v1.6.1_coreos.0
         command:
         - /hyperkube
         - proxy