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

Commit 976e946

Browse files
authored
Merge pull request #996 from camilb/bump-kubernetes-version
Bump kubernetes version to 1.8.2.
2 parents 44efb9d + f0045b9 commit 976e946

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

contrib/bump-version

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
if [ $# -ne 1 ] || [ `expr $1 : ".*_.*"` == 0 ]; then
88
echo "USAGE: $0 <target-version>"
9-
echo " example: $0 'v1.7.8_coreos.1'"
9+
echo " example: $0 'v1.8.2_coreos.0'"
1010
exit 1
1111
fi
1212

1313
# the version needs to be published, see https://quay.io/repository/coreos/hyperkube?tag=latest&tab=tags
14-
CURRENT_VERSION=${CURRENT_VERSION:-"v1.7.8_coreos.1"}
14+
CURRENT_VERSION=${CURRENT_VERSION:-"v1.8.2_coreos.0"}
1515
TARGET_VERSION=${1}
1616

1717
CURRENT_VERSION_BASE=${CURRENT_VERSION%%_*}

core/controlplane/config/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
)
3030

3131
const (
32-
k8sVer = "v1.7.8_coreos.1"
32+
k8sVer = "v1.8.2_coreos.0"
3333

3434
credentialsDir = "credentials"
3535
userDataDir = "userdata"

core/controlplane/config/templates/cluster.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -938,7 +938,7 @@ worker:
938938
# and pulling from quay or dockerhub is slow and you get many timeouts.
939939

940940
# Version of hyperkube image to use. This is the tag for the hyperkube image repository.
941-
# kubernetesVersion: v1.7.8_coreos.1
941+
# kubernetesVersion: v1.8.2_coreos.0
942942

943943
# Hyperkube image repository to use.
944944
# hyperkubeImage:

e2e/kubernetes/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM golang:1.8.3
22

3-
ARG KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.7.8+coreos.1}
3+
ARG KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.8.2+coreos.0}
44

55
RUN apt-get update && \
66
apt-get install -y rsync && \

e2e/kubernetes/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
KUBERNETES_VERSION ?= v1.7.8+coreos.1
1+
KUBERNETES_VERSION ?= v1.8.2+coreos.0
22
DOCKER_REPO ?=
33
DOCKER_TAG ?= $(DOCKER_REPO)kube-e2e:$(KUBERNETES_VERSION)
44
DOCKER_TAG_SANITIZED ?= $(shell echo $(DOCKER_TAG) | sed -e 's/+/_/')

0 commit comments

Comments
 (0)