diff options
| author | Zuul <zuul@review.openstack.org> | 2018-08-30 09:29:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-08-30 09:29:26 +0000 |
| commit | c90a0e6c43eb9c5444816c77d62b7460e20605bd (patch) | |
| tree | bbbc9cf2540d4ae7c343aceb9564392601538f05 /docker | |
| parent | ca5e30ccf962a430a1968201e0ebdc85a9fb27df (diff) | |
| parent | 1fdef7d23b524ef1cabf6ed2dd4c5af65f15cfed (diff) | |
| download | kolla-c90a0e6c43eb9c5444816c77d62b7460e20605bd.tar.gz kolla-c90a0e6c43eb9c5444816c77d62b7460e20605bd.zip | |
Merge "Update Kubernetes v1.9.4 to v1.11.1"
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 4819b8b62..d0dc32fa3 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.9.4 +ENV KUBERNETES_VERSION=v1.11.1 {% if base_arch == 'x86_64' %} ENV KUBE_ARCH=amd64 |