Merge pull request #369 from aaronlevy/v1.5.4

Bump to kubernetes V1.5.4
kubernetes-retired · Mar 10, 2017 · a1bcf5f · a1bcf5f
2 parents 37713ee + 514bb5f
commit a1bcf5f
Show file tree

Hide file tree

Showing 28 changed files with 272 additions and 136 deletions.
diff --git a/Makefile b/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.3+coreos.0
+VENDOR_VERSION = v1.5.4+coreos.0
 ETCD_OPERATOR_VERSION = v0.2.1
 vendor:
 	@echo "Creating k8s vendor for: $(VENDOR_VERSION)"

diff --git a/hack/multi-node/user-data.sample b/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.3_coreos.0
+        Environment=KUBELET_IMAGE_TAG=v1.5.4_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"

diff --git a/hack/single-node/user-data.sample b/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.3_coreos.0
+        Environment=KUBELET_IMAGE_TAG=v1.5.4_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"

diff --git a/hack/tests/conformance-test.sh b/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.3+coreos.0}
+CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.5.4+coreos.0}
 
 usage() {
     echo "USAGE:"

diff --git a/pkg/asset/internal/templates.go b/pkg/asset/internal/templates.go
@@ -50,7 +50,7 @@ spec:
     spec:
       containers:
       - name: kubelet
-        image: quay.io/coreos/hyperkube:v1.5.3_coreos.0
+        image: quay.io/coreos/hyperkube:v1.5.4_coreos.0
         command:
         - ./hyperkube
         - kubelet
@@ -147,7 +147,7 @@ spec:
       hostNetwork: true
       containers:
       - name: kube-apiserver
-        image: quay.io/coreos/hyperkube:v1.5.3_coreos.0
+        image: quay.io/coreos/hyperkube:v1.5.4_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.3_coreos.0
+        image: quay.io/coreos/hyperkube:v1.5.4_coreos.0
         command:
         - ./hyperkube
         - controller-manager
@@ -347,7 +347,7 @@ spec:
         master: "true"
       containers:
       - name: kube-scheduler
-        image: quay.io/coreos/hyperkube:v1.5.3_coreos.0
+        image: quay.io/coreos/hyperkube:v1.5.4_coreos.0
         command:
         - ./hyperkube
         - scheduler
@@ -380,7 +380,7 @@ spec:
       hostNetwork: true
       containers:
       - name: kube-proxy
-        image: quay.io/coreos/hyperkube:v1.5.3_coreos.0
+        image: quay.io/coreos/hyperkube:v1.5.4_coreos.0
         command:
         - /hyperkube
         - proxy

diff --git a/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/aws/aws.go b/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/aws/aws.go
diff --git a/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/aws/device_allocator.go b/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/aws/device_allocator.go
diff --git a/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/aws/device_allocator_test.go b/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/aws/device_allocator_test.go
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/cronjob/controller.go b/vendor/k8s.io/kubernetes/pkg/controller/cronjob/controller.go
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/deployment/deployment_controller.go b/vendor/k8s.io/kubernetes/pkg/controller/deployment/deployment_controller.go
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/deployment/sync.go b/vendor/k8s.io/kubernetes/pkg/controller/deployment/sync.go
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/deployment/util/deployment_util.go b/vendor/k8s.io/kubernetes/pkg/controller/deployment/util/deployment_util.go