Merge "kubernetes: get it working on AArch64 as well"

6 files changed, 22 insertions, 20 deletions

diff --git a/docker/kube/kube-apiserver-amd64/Dockerfile.j2 b/docker/kube/kube-apiserver/Dockerfile.j2
index de522ff66..c0918ce40 100644
--- a/docker/kube/kube-apiserver-amd64/Dockerfile.j2
+++ b/docker/kube/kube-apiserver/Dockerfile.j2
@@ -3,9 +3,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 ENV KUBERNETES_COMPONENT=kube-apiserver
 
-{% block kube_apiserver_amd64_header %}{% endblock %}
+{% block kube_apiserver_header %}{% endblock %}
 
-{% block kube_apiserver_amd64_install %}
+{% block kube_apiserver_install %}
 RUN true \
     && curl -L ${KUBERNETES_DOWNLOAD_ROOT}/${KUBERNETES_COMPONENT} -o /usr/bin/${KUBERNETES_COMPONENT} \
     && chmod +x /usr/bin/${KUBERNETES_COMPONENT}
@@ -15,5 +15,5 @@ RUN true \
 ENTRYPOINT []
 CMD []
 
-{% block kube_apiserver_amd64_footer %}{% endblock %}
+{% block kube_apiserver_footer %}{% endblock %}
 {% block footer %}{% endblock %}
diff --git a/docker/kube/kube-base/Dockerfile.j2 b/docker/kube/kube-base/Dockerfile.j2
index 907bef68e..283e69d43 100644
--- a/docker/kube/kube-base/Dockerfile.j2
+++ b/docker/kube/kube-base/Dockerfile.j2
@@ -3,14 +3,16 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 ENV KUBERNETES_VERSION=v1.5.4
 
-{% if base_arch != 'x86_64' %}
-
+{% if base_arch == 'x86_64' %}
+ENV KUBE_ARCH=amd64
+{% elif base_arch == 'aarch64' %}
+ENV KUBE_ARCH=arm64
+{% else %}
 RUN echo 'Kubernetes images not yet available for {{ base_arch }}' \
-    && /bin/false
-
+&& /bin/false
 {% endif %}
 
-ENV KUBERNETES_DOWNLOAD_ROOT=https://storage.googleapis.com/kubernetes-release/release/${KUBERNETES_VERSION}/bin/linux/amd64
+ENV KUBERNETES_DOWNLOAD_ROOT=https://storage.googleapis.com/kubernetes-release/release/${KUBERNETES_VERSION}/bin/linux/${KUBE_ARCH}
 
 {% block kube_base_header %}{% endblock %}
 
diff --git a/docker/kube/kube-controller-manager-amd64/Dockerfile.j2 b/docker/kube/kube-controller-manager/Dockerfile.j2
index 452a936f4..6494bd0e8 100644
--- a/docker/kube/kube-controller-manager-amd64/Dockerfile.j2
+++ b/docker/kube/kube-controller-manager/Dockerfile.j2
@@ -3,7 +3,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 ENV KUBERNETES_COMPONENT=kube-controller-manager
 
-{% block kube_controller_manager_amd64_header %}{% endblock %}
+{% block kube_controller_manager_header %}{% endblock %}
 
 {% import "macros.j2" as macros with context %}
 
@@ -18,7 +18,7 @@ ENV KUBERNETES_COMPONENT=kube-controller-manager
 {% endif %}
 {{ macros.install_packages(ceph_support_packages | customizable("packages")) }}
 
-{% block kube_controller_manager_amd64_install %}
+{% block kube_controller_manager_install %}
 RUN true \
     && curl -L ${KUBERNETES_DOWNLOAD_ROOT}/${KUBERNETES_COMPONENT} -o /usr/bin/${KUBERNETES_COMPONENT} \
     && chmod +x /usr/bin/${KUBERNETES_COMPONENT}
@@ -28,5 +28,5 @@ RUN true \
 ENTRYPOINT []
 CMD []
 
-{% block kube_controller_manager_amd64_footer %}{% endblock %}
+{% block kube_controller_manager_footer %}{% endblock %}
 {% block footer %}{% endblock %}
diff --git a/docker/kube/kube-discovery-amd64/Dockerfile.j2 b/docker/kube/kube-discovery/Dockerfile.j2
index b347525c0..09cf9ecbe 100644
--- a/docker/kube/kube-discovery-amd64/Dockerfile.j2
+++ b/docker/kube/kube-discovery/Dockerfile.j2
@@ -3,9 +3,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 ENV KUBERNETES_COMPONENT=kube-discovery
 
-{% block kube_discovery_amd64_header %}{% endblock %}
+{% block kube_discovery_header %}{% endblock %}
 
-{% block kube_discovery_amd64_install %}
+{% block kube_discovery_install %}
 # To match upstream we load the binary to /usr/local/bin
 RUN true \
     && curl -L ${KUBERNETES_DOWNLOAD_ROOT}/${KUBERNETES_COMPONENT} -o /usr/local/bin/${KUBERNETES_COMPONENT} \
@@ -16,5 +16,5 @@ RUN true \
 ENTRYPOINT []
 CMD []
 
-{% block kube_discovery_amd64_footer %}{% endblock %}
+{% block kube_discovery_footer %}{% endblock %}
 {% block footer %}{% endblock %}
diff --git a/docker/kube/kube-proxy-amd64/Dockerfile.j2 b/docker/kube/kube-proxy/Dockerfile.j2
index aff253b66..56532e4a4 100644
--- a/docker/kube/kube-proxy-amd64/Dockerfile.j2
+++ b/docker/kube/kube-proxy/Dockerfile.j2
@@ -3,9 +3,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 ENV KUBERNETES_COMPONENT=kube-proxy
 
-{% block kube_proxy_amd64_header %}{% endblock %}
+{% block kube_proxy_header %}{% endblock %}
 
-{% block kube_proxy_amd64_install %}
+{% block kube_proxy_install %}
 RUN true \
     && curl -L ${KUBERNETES_DOWNLOAD_ROOT}/${KUBERNETES_COMPONENT} -o /usr/bin/${KUBERNETES_COMPONENT} \
     && chmod +x /usr/bin/${KUBERNETES_COMPONENT}
@@ -15,5 +15,5 @@ RUN true \
 ENTRYPOINT []
 CMD []
 
-{% block kube_proxy_amd64_footer %}{% endblock %}
+{% block kube_proxy_footer %}{% endblock %}
 {% block footer %}{% endblock %}
diff --git a/docker/kube/kube-scheduler-amd64/Dockerfile.j2 b/docker/kube/kube-scheduler/Dockerfile.j2
index d1babfb78..8f4adc061 100644
--- a/docker/kube/kube-scheduler-amd64/Dockerfile.j2
+++ b/docker/kube/kube-scheduler/Dockerfile.j2
@@ -3,9 +3,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 ENV KUBERNETES_COMPONENT=kube-scheduler
 
-{% block kube_scheduler_amd64_header %}{% endblock %}
+{% block kube_scheduler_header %}{% endblock %}
 
-{% block kube_scheduler_amd64_install %}
+{% block kube_scheduler_install %}
 RUN true \
     && curl -L ${KUBERNETES_DOWNLOAD_ROOT}/${KUBERNETES_COMPONENT} -o /usr/bin/${KUBERNETES_COMPONENT} \
     && chmod +x /usr/bin/${KUBERNETES_COMPONENT}
@@ -15,5 +15,5 @@ RUN true \
 ENTRYPOINT []
 CMD []
 
-{% block kube_scheduler_amd64_footer %}{% endblock %}
+{% block kube_scheduler_footer %}{% endblock %}
 {% block footer %}{% endblock %}