diff options
| author | Zuul <zuul@review.openstack.org> | 2018-03-19 05:25:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-03-19 05:25:06 +0000 |
| commit | fd3f8261d9f593597ab0f9ee82c43dbd5e058148 (patch) | |
| tree | 7f5aa206fccbab82b0e5cbd34364b30401c96b47 /docker | |
| parent | c251ee671b1d3f80b728779b8b9603f3cd7cb962 (diff) | |
| parent | a74ac79e4c7118c28ca9675e9865760576529462 (diff) | |
| download | kolla-fd3f8261d9f593597ab0f9ee82c43dbd5e058148.tar.gz kolla-fd3f8261d9f593597ab0f9ee82c43dbd5e058148.zip | |
Merge "Update Kubernetes v1.5.4 to 1.9.4"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/kube/kube-base/Dockerfile.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/kube/kube-base/Dockerfile.j2 b/docker/kube/kube-base/Dockerfile.j2 index 283e69d43..4819b8b62 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 }} 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 |