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

Commit

Permalink
Merge pull request #765 from dghubble/bump-hyperkube
Browse files Browse the repository at this point in the history
hack,pkg: Update Kubernetes from v1.8.2 to v1.8.3
  • Loading branch information
dghubble authored Nov 9, 2017
2 parents b1468bf + 5105f42 commit 1d94dc9
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion hack/multi-node/user-data.sample
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.2
Environment=KUBELET_IMAGE_TAG=v1.8.3
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
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.2
Environment=KUBELET_IMAGE_TAG=v1.8.3
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
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.2
Environment=KUBELET_IMAGE_TAG=v1.8.3
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
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.2
Environment=KUBELET_IMAGE_TAG=v1.8.3
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
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.2}
CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.8.3}

usage() {
echo "USAGE:"
Expand Down
2 changes: 1 addition & 1 deletion pkg/asset/images.go
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.2",
Hyperkube: "gcr.io/google_containers/hyperkube:v1.8.3",
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

0 comments on commit 1d94dc9

Please sign in to comment.