Merge pull request #293 from squat/bump_hyperkube

pkg: bump hyperkube to v1.5.2_coreos.2
kubernetes-retired · Feb 4, 2017 · 91c850c · 91c850c
2 parents b2a25e2 + 4729306
commit 91c850c
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 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.2+coreos.1
+VENDOR_VERSION = v1.5.2+coreos.2
 ETCD_OPERATOR_VERSION = 7315cda48a511c8bcab1e575ee0626eae7d07d2d
 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_ACI=quay.io/coreos/hyperkube
-        Environment=KUBELET_VERSION=v1.5.2_coreos.1
+        Environment=KUBELET_VERSION=v1.5.2_coreos.2
         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

diff --git a/hack/quickstart/kubelet.master b/hack/quickstart/kubelet.master
@@ -1,6 +1,6 @@
 [Service]
 Environment=KUBELET_ACI=quay.io/coreos/hyperkube
-Environment=KUBELET_VERSION=v1.5.2_coreos.1
+Environment=KUBELET_VERSION=v1.5.2_coreos.2
 Environment="RKT_OPTS=\
 --volume etc-resolv,kind=host,source=/etc/resolv.conf --mount volume=etc-resolv,target=/etc/resolv.conf \
 --volume var-lib-cni,kind=host,source=/var/lib/cni --mount volume=var-lib-cni,target=/var/lib/cni"

diff --git a/hack/quickstart/kubelet.worker b/hack/quickstart/kubelet.worker
@@ -1,6 +1,6 @@
 [Service]
 Environment=KUBELET_ACI=quay.io/coreos/hyperkube
-Environment=KUBELET_VERSION=v1.5.2_coreos.1
+Environment=KUBELET_VERSION=v1.5.2_coreos.2
 Environment="RKT_OPTS=\
 --volume etc-resolv,kind=host,source=/etc/resolv.conf --mount volume=etc-resolv,target=/etc/resolv.conf \
 --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_ACI=quay.io/coreos/hyperkube
-        Environment=KUBELET_VERSION=v1.5.2_coreos.1
+        Environment=KUBELET_VERSION=v1.5.2_coreos.2
         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

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

diff --git a/pkg/asset/internal/templates.go b/pkg/asset/internal/templates.go
@@ -35,7 +35,7 @@ spec:
     spec:
       containers:
       - name: kubelet
-        image: quay.io/coreos/hyperkube:v1.5.2_coreos.1
+        image: quay.io/coreos/hyperkube:v1.5.2_coreos.2
         command:
         - ./hyperkube
         - kubelet
@@ -132,7 +132,7 @@ spec:
       hostNetwork: true
       containers:
       - name: kube-apiserver
-        image: quay.io/coreos/hyperkube:v1.5.2_coreos.1
+        image: quay.io/coreos/hyperkube:v1.5.2_coreos.2
         command:
         - /usr/bin/flock
         - --exclusive
@@ -229,7 +229,7 @@ spec:
         master: "true"
       containers:
       - name: kube-controller-manager
-        image: quay.io/coreos/hyperkube:v1.5.2_coreos.1
+        image: quay.io/coreos/hyperkube:v1.5.2_coreos.2
         command:
         - ./hyperkube
         - controller-manager
@@ -286,7 +286,7 @@ spec:
         master: "true"
       containers:
       - name: kube-scheduler
-        image: quay.io/coreos/hyperkube:v1.5.2_coreos.1
+        image: quay.io/coreos/hyperkube:v1.5.2_coreos.2
         command:
         - ./hyperkube
         - scheduler
@@ -319,7 +319,7 @@ spec:
       hostNetwork: true
       containers:
       - name: kube-proxy
-        image: quay.io/coreos/hyperkube:v1.5.2_coreos.1
+        image: quay.io/coreos/hyperkube:v1.5.2_coreos.2
         command:
         - /hyperkube
         - proxy