From 2ac305fd29f45b15e39eac50b591c2a8a8849940 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Mon, 20 Nov 2017 11:27:32 -0800 Subject: [PATCH] pkg,hack: Update Kubernetes from v1.8.3 to v1.8.4 --- hack/multi-node/user-data.sample | 2 +- hack/quickstart/kubelet.master | 2 +- hack/quickstart/kubelet.worker | 2 +- hack/single-node/user-data.sample | 2 +- hack/tests/conformance-test.sh | 2 +- pkg/asset/images.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hack/multi-node/user-data.sample b/hack/multi-node/user-data.sample index 1b6d7c985..5794a51f0 100644 --- 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=docker://gcr.io/google_containers/hyperkube - Environment=KUBELET_IMAGE_TAG=v1.8.3 + Environment=KUBELET_IMAGE_TAG=v1.8.4 Environment="RKT_RUN_ARGS=--uuid-file-save=/var/cache/kubelet-pod.uuid \ --volume var-lib-cni,kind=host,source=/var/lib/cni \ --volume opt-cni-bin,kind=host,source=/opt/cni/bin \ diff --git a/hack/quickstart/kubelet.master b/hack/quickstart/kubelet.master index 75af28cc0..973ab3c9f 100644 --- a/hack/quickstart/kubelet.master +++ b/hack/quickstart/kubelet.master @@ -1,6 +1,6 @@ [Service] Environment=KUBELET_IMAGE_URL=docker://gcr.io/google_containers/hyperkube -Environment=KUBELET_IMAGE_TAG=v1.8.3 +Environment=KUBELET_IMAGE_TAG=v1.8.4 Environment="RKT_RUN_ARGS=\ --uuid-file-save=/var/cache/kubelet-pod.uuid \ --volume etc-resolv,kind=host,source=/etc/resolv.conf --mount volume=etc-resolv,target=/etc/resolv.conf \ diff --git a/hack/quickstart/kubelet.worker b/hack/quickstart/kubelet.worker index d3ab1316c..cc906b755 100644 --- a/hack/quickstart/kubelet.worker +++ b/hack/quickstart/kubelet.worker @@ -1,6 +1,6 @@ [Service] Environment=KUBELET_IMAGE_URL=docker://gcr.io/google_containers/hyperkube -Environment=KUBELET_IMAGE_TAG=v1.8.3 +Environment=KUBELET_IMAGE_TAG=v1.8.4 Environment="RKT_RUN_ARGS=\ --uuid-file-save=/var/cache/kubelet-pod.uuid \ --volume etc-resolv,kind=host,source=/etc/resolv.conf --mount volume=etc-resolv,target=/etc/resolv.conf \ diff --git a/hack/single-node/user-data.sample b/hack/single-node/user-data.sample index aa44cf0cc..678d3536b 100644 --- a/hack/single-node/user-data.sample +++ b/hack/single-node/user-data.sample @@ -9,7 +9,7 @@ coreos: [Service] EnvironmentFile=/etc/environment Environment=KUBELET_IMAGE_URL=docker://gcr.io/google_containers/hyperkube - Environment=KUBELET_IMAGE_TAG=v1.8.3 + Environment=KUBELET_IMAGE_TAG=v1.8.4 Environment="RKT_RUN_ARGS=--uuid-file-save=/var/cache/kubelet-pod.uuid \ --volume var-lib-cni,kind=host,source=/var/lib/cni \ --volume opt-cni-bin,kind=host,source=/opt/cni/bin \ diff --git a/hack/tests/conformance-test.sh b/hack/tests/conformance-test.sh index b2a09ea35..fc9acc043 100755 --- 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/kubernetes/kubernetes} -CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.8.3} +CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.8.4} usage() { echo "USAGE:" diff --git a/pkg/asset/images.go b/pkg/asset/images.go index 7d33d1ffe..168144615 100644 --- a/pkg/asset/images.go +++ b/pkg/asset/images.go @@ -8,7 +8,7 @@ var DefaultImages = ImageVersions{ FlannelCNI: "quay.io/coreos/flannel-cni:v0.3.0", Calico: "quay.io/calico/node:v2.6.1", CalicoCNI: "quay.io/calico/cni:v1.11.0", - Hyperkube: "gcr.io/google_containers/hyperkube:v1.8.3", + Hyperkube: "gcr.io/google_containers/hyperkube:v1.8.4", Kenc: "quay.io/coreos/kenc:0.0.2", KubeDNS: "gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5", KubeDNSMasq: "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5",