Merge pull request #140 from aaronlevy/v1.3.7

V1.3.7

Author: aaronlevy

Makefile

@@ -42,7 +42,7 @@ conformance-%: clean all
 # This will naively try and create a vendor dir from a k8s release
 # USE: make vendor VENDOR_VERSION=vX.Y.Z
 #TODO(aaron): Prompt because this is destructive
-VENDOR_VERSION = v1.3.6+coreos.0
+VENDOR_VERSION = v1.3.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.3.6_coreos.0
+        Environment=KUBELET_VERSION=v1.3.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/quickstart/kubelet.master

@@ -4,7 +4,7 @@ After=docker.service etcd2.service flanneld.service
 
 [Service]
 Environment=KUBELET_ACI=quay.io/coreos/hyperkube
-Environment=KUBELET_VERSION=v1.3.6_coreos.0
+Environment=KUBELET_VERSION=v1.3.7_coreos.0
 Environment="RKT_OPTS=--volume etc-resolv,kind=host,source=/etc/resolv.conf --mount volume=etc-resolv,target=/etc/resolv.conf"
 EnvironmentFile=/etc/environment
 

hack/quickstart/kubelet.worker

@@ -4,7 +4,7 @@ After=docker.service flanneld.service
 
 [Service]
 Environment=KUBELET_ACI=quay.io/coreos/hyperkube
-Environment=KUBELET_VERSION=v1.3.6_coreos.0
+Environment=KUBELET_VERSION=v1.3.7_coreos.0
 Environment="RKT_OPTS=--volume etc-resolv,kind=host,source=/etc/resolv.conf --mount volume=etc-resolv,target=/etc/resolv.conf"
 EnvironmentFile=/etc/environment
 

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.3.6_coreos.0
+        Environment=KUBELET_VERSION=v1.3.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

@@ -3,7 +3,7 @@ set -euo pipefail
 
 CHECK_NODE_COUNT=${CHECK_NODE_COUNT:-true}
 CONFORMANCE_REPO=${CONFORMANCE_REPO:-github.com/coreos/kubernetes}
-CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.3.6+coreos.0}
+CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.3.7+coreos.0}
 TEST_ARGS=${TEST_ARGS:-"--ginkgo.focus='\[Conformance\]' --ginkgo.skip='\[Flaky\]|\[Feature:.+\]'"}
 
 usage() {

pkg/asset/internal/templates.go

@@ -26,17 +26,17 @@ metadata:
   namespace: kube-system
   labels:
     k8s-app: kubelet
-    version: v1.3.6_coreos.0
+    version: v1.3.7_coreos.0
 spec:
   template:
     metadata:
       labels:
         k8s-app: kubelet
-        version: v1.3.6_coreos.0
+        version: v1.3.7_coreos.0
     spec:
       containers:
       - name: kubelet
-        image: quay.io/coreos/hyperkube:v1.3.6_coreos.0
+        image: quay.io/coreos/hyperkube:v1.3.7_coreos.0
         command:
         - /nsenter
         - --target=1
@@ -116,13 +116,13 @@ metadata:
   namespace: kube-system
   labels:
     k8s-app: kube-apiserver
-    version: v1.3.6_coreos.0
+    version: v1.3.7_coreos.0
 spec:
   template:
     metadata:
       labels:
         k8s-app: kube-apiserver
-        version: v1.3.6_coreos.0
+        version: v1.3.7_coreos.0
     spec:
       nodeSelector:
         master: "true"
@@ -136,7 +136,7 @@ spec:
         - mountPath: /etc/kubernetes/manifests
           name: etc-k8s-manifests
       - name: kube-apiserver
-        image: quay.io/coreos/hyperkube:v1.3.6_coreos.0
+        image: quay.io/coreos/hyperkube:v1.3.7_coreos.0
         command:
         - /hyperkube
         - apiserver
@@ -182,17 +182,17 @@ metadata:
   namespace: kube-system
   labels:
     k8s-app: kube-controller-manager
-    version: v1.3.6_coreos.0
+    version: v1.3.7_coreos.0
 spec:
   template:
     metadata:
       labels:
         k8s-app: kube-controller-manager
-        version: v1.3.6_coreos.0
+        version: v1.3.7_coreos.0
     spec:
       containers:
       - name: kube-controller-manager
-        image: quay.io/coreos/hyperkube:v1.3.6_coreos.0
+        image: quay.io/coreos/hyperkube:v1.3.7_coreos.0
         command:
         - ./hyperkube
         - controller-manager
@@ -221,17 +221,17 @@ metadata:
   namespace: kube-system
   labels:
     k8s-app: kube-scheduler
-    version: v1.3.6_coreos.0
+    version: v1.3.7_coreos.0
 spec:
   template:
     metadata:
       labels:
         k8s-app: kube-scheduler
-        version: v1.3.6_coreos.0
+        version: v1.3.7_coreos.0
     spec:
       containers:
       - name: kube-scheduler
-        image: quay.io/coreos/hyperkube:v1.3.6_coreos.0
+        image: quay.io/coreos/hyperkube:v1.3.7_coreos.0
         command:
         - ./hyperkube
         - scheduler
@@ -244,18 +244,18 @@ metadata:
   namespace: kube-system
   labels:
     k8s_app: kube-proxy
-    version: v1.3.6_coreos.0
+    version: v1.3.7_coreos.0
 spec:
   template:
     metadata:
       labels:
         k8s_app: kube-proxy
-        version: v1.3.6_coreos.0
+        version: v1.3.7_coreos.0
     spec:
       hostNetwork: true
       containers:
       - name: kube-proxy
-        image: quay.io/coreos/hyperkube:v1.3.6_coreos.0
+        image: quay.io/coreos/hyperkube:v1.3.7_coreos.0
         command:
         - /hyperkube
         - proxy