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

pkg,hack: Update Kubernetes from v1.8.3 to v1.8.4 #780

Merged
merged 1 commit into from
Nov 27, 2017
Merged

pkg,hack: Update Kubernetes from v1.8.3 to v1.8.4 #780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hack/multi-node/user-data.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion hack/quickstart/kubelet.master
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion hack/quickstart/kubelet.worker
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion hack/single-node/user-data.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion hack/tests/conformance-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:"
Expand Down
2 changes: 1 addition & 1 deletion pkg/asset/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down