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

Commit

Permalink
Upgrade kubernetes version to v1.5.3
Browse files Browse the repository at this point in the history
  • Loading branch information
gianrubio committed Feb 15, 2017
1 parent 9dffba1 commit b10a243
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion config/config.go
Expand Up @@ -70,7 +70,7 @@ func NewDefaultCluster() *Cluster {
ClusterName: "kubernetes",
VPCCIDR: "10.0.0.0/16",
ReleaseChannel: "stable",
K8sVer: "v1.5.2_coreos.0",
K8sVer: "v1.5.3_coreos.0",
HyperkubeImageRepo: "quay.io/coreos/hyperkube",
AWSCliImageRepo: "quay.io/coreos/awscli",
AWSCliTag: "master",
Expand Down
2 changes: 1 addition & 1 deletion config/templates/cluster.yaml
Expand Up @@ -394,7 +394,7 @@ kmsKeyArn: "{{.KMSKeyARN}}"
#tlsCertDurationDays: 365

# Version of hyperkube image to use. This is the tag for the hyperkube image repository.
# kubernetesVersion: v1.5.2_coreos.0
# kubernetesVersion: v1.5.3_coreos.0

# Hyperkube image repository to use.
# hyperkubeImageRepo: quay.io/coreos/hyperkube
Expand Down
4 changes: 2 additions & 2 deletions contrib/bump-version
Expand Up @@ -6,11 +6,11 @@

if [ $# -ne 1 ] || [ `expr $1 : ".*_.*"` == 0 ]; then
echo "USAGE: $0 <target-version>"
echo " example: $0 'v1.5.2_coreos.0'"
echo " example: $0 'v1.5.3_coreos.0'"
exit 1
fi

CURRENT_VERSION=${CURRENT_VERSION:-"v1.5.2_coreos.0"}
CURRENT_VERSION=${CURRENT_VERSION:-"v1.5.3_coreos.0"}
TARGET_VERSION=${1}

CURRENT_VERSION_BASE=${CURRENT_VERSION%%_*}
Expand Down
2 changes: 1 addition & 1 deletion e2e/kubernetes/Dockerfile
@@ -1,6 +1,6 @@
FROM golang:1.7.1

ARG KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.5.2+coreos.0}
ARG KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.5.3+coreos.0}

RUN apt-get update && \
apt-get install -y rsync && \
Expand Down
2 changes: 1 addition & 1 deletion e2e/kubernetes/Makefile
@@ -1,4 +1,4 @@
KUBERNETES_VERSION ?= v1.5.2+coreos.0
KUBERNETES_VERSION ?= v1.5.3+coreos.0
DOCKER_REPO ?=
DOCKER_TAG ?= $(DOCKER_REPO)kube-e2e:$(KUBERNETES_VERSION)
DOCKER_TAG_SANITIZED ?= $(shell echo $(DOCKER_TAG) | sed -e 's/+/_/')
Expand Down
2 changes: 1 addition & 1 deletion nodepool/config/templates/cluster.yaml
Expand Up @@ -181,7 +181,7 @@ dnsServiceIP: "{{.DNSServiceIP}}"
# mapPublicIPs: false

# Version of hyperkube image to use. This is the tag for the hyperkube image repository.
# kubernetesVersion: v1.4.5_coreos.0
# kubernetesVersion: v1.5.3_coreos.0

# Hyperkube image repository to use.
# hyperkubeImageRepo: quay.io/coreos/hyperkube
Expand Down

0 comments on commit b10a243

Please sign in to comment.