aboutsummaryrefslogtreecommitdiff
path: root/docker/macros.j2
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-02-21 11:02:31 +0000
committerGerrit Code Review <review@openstack.org>2019-02-21 11:02:31 +0000
commitefc32ec0f44ab946766ab83b602d4cad4b420236 (patch)
tree4e85e7b32d92cb903f5799ecc3a573c8be6783f0 /docker/macros.j2
parenta445d5085c32bb230df0ba5f1b1b08cb80906cbf (diff)
parentab679adcbfaa251b2de00daa0acdbb7771a8ae04 (diff)
downloadkolla-efc32ec0f44ab946766ab83b602d4cad4b420236.tar.gz
kolla-efc32ec0f44ab946766ab83b602d4cad4b420236.zip
Merge "debian/ubuntu: introduce 'debian_arch' variable"
Diffstat (limited to 'docker/macros.j2')
-rw-r--r--docker/macros.j212
1 files changed, 1 insertions, 11 deletions
diff --git a/docker/macros.j2 b/docker/macros.j2
index 111572140..171d9564c 100644
--- a/docker/macros.j2
+++ b/docker/macros.j2
@@ -75,21 +75,11 @@ RUN apt-get update \
{% endmacro %}
{% macro install_kubectl() %}
- {% if base_arch == 'x86_64' %}
- ENV KUBE_ARCH=amd64
- {% elif base_arch == 'aarch64' %}
- ENV KUBE_ARCH=arm64
- {% else %}
- RUN echo 'There is no "kubectl" binary for {{ base_arch }}' \
- && /bin/false
- {% endif %}
-
# TODO(mandre) check for file integrity instead of downloading from an HTTPS source
- RUN curl -o /usr/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.5.4/bin/linux/${KUBE_ARCH}/kubectl \
+ RUN curl -o /usr/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.5.4/bin/linux/{{debian_arch}}/kubectl \
&& chmod 755 /usr/bin/kubectl
{% endmacro %}
-
{% macro install_fluent_plugins(plugins) -%}
{% if plugins is defined and plugins|length > 0 -%}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] -%}