Skip to content
This repository was archived by the owner on Jul 30, 2021. It is now read-only.

Commit e17558b

Browse files
authored
Merge pull request #799 from dghubble/hyperkube
pkg,hack: Update Kubernetes from v1.8.4 to v1.8.5
2 parents 64c66a3 + 9e9ed9e commit e17558b

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

hack/multi-node/user-data.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ coreos:
99
[Service]
1010
EnvironmentFile=/etc/environment
1111
Environment=KUBELET_IMAGE_URL=docker://gcr.io/google_containers/hyperkube
12-
Environment=KUBELET_IMAGE_TAG=v1.8.4
12+
Environment=KUBELET_IMAGE_TAG=v1.8.5
1313
Environment="RKT_RUN_ARGS=--uuid-file-save=/var/cache/kubelet-pod.uuid \
1414
--volume var-lib-cni,kind=host,source=/var/lib/cni \
1515
--volume opt-cni-bin,kind=host,source=/opt/cni/bin \

hack/quickstart/kubelet.master

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[Service]
22
Environment=KUBELET_IMAGE_URL=docker://gcr.io/google_containers/hyperkube
3-
Environment=KUBELET_IMAGE_TAG=v1.8.4
3+
Environment=KUBELET_IMAGE_TAG=v1.8.5
44
Environment="RKT_RUN_ARGS=\
55
--uuid-file-save=/var/cache/kubelet-pod.uuid \
66
--volume etc-resolv,kind=host,source=/etc/resolv.conf --mount volume=etc-resolv,target=/etc/resolv.conf \

hack/quickstart/kubelet.worker

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[Service]
22
Environment=KUBELET_IMAGE_URL=docker://gcr.io/google_containers/hyperkube
3-
Environment=KUBELET_IMAGE_TAG=v1.8.4
3+
Environment=KUBELET_IMAGE_TAG=v1.8.5
44
Environment="RKT_RUN_ARGS=\
55
--uuid-file-save=/var/cache/kubelet-pod.uuid \
66
--volume etc-resolv,kind=host,source=/etc/resolv.conf --mount volume=etc-resolv,target=/etc/resolv.conf \

hack/single-node/user-data.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ coreos:
99
[Service]
1010
EnvironmentFile=/etc/environment
1111
Environment=KUBELET_IMAGE_URL=docker://gcr.io/google_containers/hyperkube
12-
Environment=KUBELET_IMAGE_TAG=v1.8.4
12+
Environment=KUBELET_IMAGE_TAG=v1.8.5
1313
Environment="RKT_RUN_ARGS=--uuid-file-save=/var/cache/kubelet-pod.uuid \
1414
--volume var-lib-cni,kind=host,source=/var/lib/cni \
1515
--volume opt-cni-bin,kind=host,source=/opt/cni/bin \

hack/tests/conformance-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -euo pipefail
33

44
CONFORMANCE_REPO=${CONFORMANCE_REPO:-github.com/kubernetes/kubernetes}
5-
CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.8.4}
5+
CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.8.5}
66

77
usage() {
88
echo "USAGE:"

pkg/asset/images.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ var DefaultImages = ImageVersions{
88
FlannelCNI: "quay.io/coreos/flannel-cni:v0.3.0",
99
Calico: "quay.io/calico/node:v2.6.3",
1010
CalicoCNI: "quay.io/calico/cni:v1.11.1",
11-
Hyperkube: "gcr.io/google_containers/hyperkube:v1.8.4",
11+
Hyperkube: "gcr.io/google_containers/hyperkube:v1.8.5",
1212
Kenc: "quay.io/coreos/kenc:0.0.2",
1313
KubeDNS: "gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5",
1414
KubeDNSMasq: "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5",

0 commit comments

Comments
 (0)