openstack
/
kolla
Code Issues Proposed changes

Merge "Update Kubernetes v1.5.4 to 1.9.4"

This commit is contained in:
Zuul 2018-03-19 05:25:06 +00:00 committed by Gerrit Code Review
parent c251ee671b a74ac79e4c
commit fd3f8261d9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/kube/kube-base/Dockerfile.j2
View File

@ -1,7 +1,7 @@
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
ENV KUBERNETES_VERSION=v1.5.4
ENV KUBERNETES_VERSION=v1.9.4
{% if base_arch == 'x86_64' %}
ENV KUBE_ARCH=amd64