aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-23 08:58:28 +0000
committerGerrit Code Review <review@openstack.org>2017-03-23 08:58:29 +0000
commit1dcbef80620249893d23bf3ff432778fd9ff9070 (patch)
tree25ac84d65c01be7753100e6fd84273db3aeb73f4 /docker
parent17a8fabe79482bd8f17ca13e4ab9761377a6401d (diff)
parentd69dc82a39baa3496bcb0d8d0a0a0a2aa953a324 (diff)
downloadkolla-1dcbef80620249893d23bf3ff432778fd9ff9070.tar.gz
kolla-1dcbef80620249893d23bf3ff432778fd9ff9070.zip
Merge "Update to Kubernetes 1.5.4"
Diffstat (limited to 'docker')
-rw-r--r--docker/kube/kube-base/Dockerfile.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/kube/kube-base/Dockerfile.j2 b/docker/kube/kube-base/Dockerfile.j2
index 21adfecdc..00af4ada9 100644
--- a/docker/kube/kube-base/Dockerfile.j2
+++ b/docker/kube/kube-base/Dockerfile.j2
@@ -1,7 +1,7 @@
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
MAINTAINER {{ maintainer }}
-ENV KUBERNETES_VERSION=v1.5.1
+ENV KUBERNETES_VERSION=v1.5.4
ENV KUBERNETES_DOWNLOAD_ROOT=https://storage.googleapis.com/kubernetes-release/release/${KUBERNETES_VERSION}/bin/linux/amd64