Merge "Remove deprecated images"

22 files changed, 0 insertions, 490 deletions

diff --git a/docker/almanach/almanach-api/Dockerfile.j2 b/docker/almanach/almanach-api/Dockerfile.j2
deleted file mode 100644
index d1075ee6d..000000000
--- a/docker/almanach/almanach-api/Dockerfile.j2
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}almanach-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-
-{% block almanach_api_header %}{% endblock %}
-
-{% if install_type == 'binary' %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
-
-{% endif %}
-
-{% block almanach_api_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER almanach
diff --git a/docker/almanach/almanach-base/Dockerfile.j2 b/docker/almanach/almanach-base/Dockerfile.j2
deleted file mode 100644
index 3a55f775b..000000000
--- a/docker/almanach/almanach-base/Dockerfile.j2
+++ /dev/null
@@ -1,34 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-
-{% block almanach_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='almanach') }}
-
-{% if install_type == 'binary' %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
-
-{% elif install_type == 'source' %}
-
-ADD almanach-base-archive /almanach-base-source
-
-{% set almanach_base_pip_packages = [
-    '/almanach'
-] %}
-
-RUN ln -s almanach-base-source/* almanach \
-    && {{ macros.install_pip(almanach_base_pip_packages | customizable("pip_packages")) }} \
-    && mkdir -p /etc/almanach \
-    && chown -R almanach: /etc/almanach
-
-{% endif %}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-
-RUN chmod 755 /usr/local/bin/kolla_extend_start
-
-{% block almanach_base_footer %}{% endblock %}
diff --git a/docker/almanach/almanach-base/extend_start.sh b/docker/almanach/almanach-base/extend_start.sh
deleted file mode 100644
index a4ffb9fe9..000000000
--- a/docker/almanach/almanach-base/extend_start.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d "/var/log/kolla/almanach" ]]; then
-    mkdir -p /var/log/kolla/almanach
-fi
-if [[ $(stat -c %a /var/log/kolla/almanach) != "755" ]]; then
-    chmod 755 /var/log/kolla/almanach
-fi
diff --git a/docker/almanach/almanach-collector/Dockerfile.j2 b/docker/almanach/almanach-collector/Dockerfile.j2
deleted file mode 100644
index ae66a7c14..000000000
--- a/docker/almanach/almanach-collector/Dockerfile.j2
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}almanach-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-
-{% block almanach_collector_header %}{% endblock %}
-
-{% if install_type == 'binary' %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
-
-{% endif %}
-
-{% block almanach_collector_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER almanach
diff --git a/docker/dind/Dockerfile.j2 b/docker/dind/Dockerfile.j2
deleted file mode 100644
index fa5daad14..000000000
--- a/docker/dind/Dockerfile.j2
+++ /dev/null
@@ -1,45 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-
-{% block dind_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if base_package_type == 'rpm' %}
-
-# Since the gate cannot do DinD on centos due to the age of the kernel, we don't
-# build a true DinD image. Should the time come that we get a newer kernel in
-# the centos gate and we want to do multinode we can populate this container
-RUN /bin/true
-
-{% elif base_package_type == 'deb' %}
-    {% set dind_packages = [
-         'btrfs-progs',
-         'docker.io',
-         'openssh-server'
-    ] %}
-
-    {% if install_type == 'binary' %}
-        {% set dind_packages = dind_packages + [
-             'python3-docker'
-        ] %}
-    {% endif %}
-
-{{ macros.install_packages(dind_packages | customizable("packages")) }}
-
-    {% if install_type == 'source' %}
-
-        {% set dind_pip_packages = [
-            'docker'
-        ] %}
-
-RUN {{ macros.install_pip(dind_pip_packages | customizable("pip_packages"), constraints = false) }}
-    {% endif %}
-
-{% endif %}
-
-COPY start.sh /usr/local/bin/kolla_start
-RUN chmod 755 /usr/local/bin/kolla_start
-
-{% block dind_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/dind/start.sh b/docker/dind/start.sh
deleted file mode 100644
index 8d861f744..000000000
--- a/docker/dind/start.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-set -o nounset
-
-# External processes will be occurring and we must wait for them
-while [[ ! -e "/kolla_dind_ready" ]]; do
-    sleep 1
-done
-
-docker daemon -s btrfs 2>&1 > docker.log &
-docker_pid=$!
-
-mkdir -p /var/run/sshd
-/usr/sbin/sshd -D 2>&1 > sshd.log &
-sshd_pid=$!
-
-mkdir -p /root/.ssh/
-echo "${SSH_PUB}" > /root/.ssh/authorized_keys
-
-# Wait for docker daemon
-sleep 5
-
-# Due to a quirk in the cloning method we end up with a bunch of dead containers
-docker rm -v -f $(docker ps -a --no-trunc -q)
-
-# Wait until child processes exit (they should never exit)
-wait
diff --git a/docker/dragonflow/dragonflow-base/Dockerfile.j2 b/docker/dragonflow/dragonflow-base/Dockerfile.j2
deleted file mode 100644
index 108bb86fb..000000000
--- a/docker/dragonflow/dragonflow-base/Dockerfile.j2
+++ /dev/null
@@ -1,49 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-
-{% block dragonflow_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='dragonflow') }}
-
-{% if install_type == 'binary' %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
-
-{% elif install_type == 'source' %}
-
-{% if base_package_type == 'rpm' %}
-    {% set dragonflow_base_packages = [
-       'zeromq-devel'
-    ] %}
-
-{% elif base_package_type == 'deb' %}
-    {% set dragonflow_base_packages = [
-       'libzmq3-dev'
-    ] %}
-
-{% endif %}
-
-{{ macros.install_packages(dragonflow_base_packages | customizable("packages")) }}
-
-{% set dragonflow_base_pip_packages = [
-    '/dragonflow'
-] %}
-
-ADD dragonflow-base-archive /dragonflow-base-source
-RUN ln -s dragonflow-base-source/* dragonflow \
-    && {{ macros.install_pip(dragonflow_base_pip_packages | customizable("pip_packages")) }} \
-    && mkdir -p /etc/dragonflow \
-    && cp -r /dragonflow/etc/* /etc/dragonflow/ \
-    && chown -R dragonflow: /etc/dragonflow
-
-{% endif %}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-
-RUN touch /usr/local/bin/kolla_dragonflow_extend_start \
-    && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_dragonflow_extend_start
-
-{% block dragonflow_base_footer %}{% endblock %}
diff --git a/docker/dragonflow/dragonflow-base/extend_start.sh b/docker/dragonflow/dragonflow-base/extend_start.sh
deleted file mode 100644
index eeb896f78..000000000
--- a/docker/dragonflow/dragonflow-base/extend_start.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# Create log dir for dragonflow logs
-LOG_DIR="/var/log/kolla/dragonflow"
-if [[ ! -d "${LOG_DIR}" ]]; then
-    mkdir -p ${LOG_DIR}
-fi
-if [[ $(stat -c %a ${LOG_DIR}) != "755" ]]; then
-    chmod 755 ${LOG_DIR}
-fi
-
-. /usr/local/bin/kolla_dragonflow_extend_start
diff --git a/docker/dragonflow/dragonflow-controller/Dockerfile.j2 b/docker/dragonflow/dragonflow-controller/Dockerfile.j2
deleted file mode 100644
index 5efaa3115..000000000
--- a/docker/dragonflow/dragonflow-controller/Dockerfile.j2
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}dragonflow-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-
-{% block dragonflow_controller_header %}{% endblock %}
-
-{% if install_type == 'binary' %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
-
-{% endif %}
-
-{% block dragonflow_controller_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER dragonflow
diff --git a/docker/dragonflow/dragonflow-metadata/Dockerfile.j2 b/docker/dragonflow/dragonflow-metadata/Dockerfile.j2
deleted file mode 100644
index 93f93a724..000000000
--- a/docker/dragonflow/dragonflow-metadata/Dockerfile.j2
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}dragonflow-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-
-{% block dragonflow_metadata_header %}{% endblock %}
-
-{% if install_type == 'binary' %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
-
-{% endif %}
-
-{% block dragonflow_metadata_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER dragonflow
diff --git a/docker/dragonflow/dragonflow-publisher-service/Dockerfile.j2 b/docker/dragonflow/dragonflow-publisher-service/Dockerfile.j2
deleted file mode 100644
index 8c55ad58e..000000000
--- a/docker/dragonflow/dragonflow-publisher-service/Dockerfile.j2
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}dragonflow-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-
-{% block dragonflow_publisher_service_header %}{% endblock %}
-
-{% if install_type == 'binary' %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
-
-{% endif %}
-
-{% block dragonflow_publisher_service_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER dragonflow
diff --git a/docker/helm-repository/Dockerfile.j2 b/docker/helm-repository/Dockerfile.j2
deleted file mode 100644
index 091cc5b1f..000000000
--- a/docker/helm-repository/Dockerfile.j2
+++ /dev/null
@@ -1,61 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-
-{% block helm_repository_version %}
-ENV helm_version=2.3.0 \
-    helm_port=8879 \
-    helm_address=0.0.0.0
-{% endblock %}
-
-{% block helm_repository_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if base_package_type == 'rpm' %}
-    {% set helm_repo_packages = [
-        'git',
-        'jq',
-        'python2-pip'
-     ] %}
-
-{% elif base_package_type == 'deb' %}
-    {% set helm_repo_packages = [
-        'git',
-        'jq',
-        'python3-pip'
-     ] %}
-
-{% endif %}
-{{ macros.install_packages(helm_repo_packages | customizable("packages")) }}
-
-{% block helm_repository_source_install_python_pip %}
-{{ macros.get_pip() }}
-{% endblock %}
-
-{% set helm_repository_pip_packages = [
-    'pyyaml'
-] %}
-
-RUN {{ macros.install_pip(helm_repository_pip_packages | customizable("pip_packages"), constraints = false) }}
-
-{% block helm_repository_install_kubernetes_helm %}
-# TODO(mandre) check for file integrity instead of downloading from an HTTPS source
-RUN curl -Lo /tmp/helm-v${helm_version}-linux-{{debian_arch}}.tar.gz  https://storage.googleapis.com/kubernetes-helm/helm-v${helm_version}-linux-{{debian_arch}}.tar.gz \
-    && sudo tar --strip-components 1 -C /usr/bin linux-{{debian_arch}}/helm -zxvf /tmp/helm-v${helm_version}-linux-{{debian_arch}}.tar.gz \
-    && sudo chmod 755 /usr/bin/helm \
-    && rm /tmp/helm-v${helm_version}-linux-{{debian_arch}}.tar.gz
-{% endblock %}
-
-RUN useradd --user-group --create-home --home-dir /home/helm helm \
-    && sudo mkdir /helm-repo \
-    && sudo chmod 755 /helm-repo \
-    && sudo chown -R helm: /helm-repo/
-
-USER helm
-
-RUN helm init --client-only
-
-CMD helm serve --address $helm_address:$helm_port --repo-path /helm-repo
-
-{% block helm_repository_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/kube/kube-apiserver/Dockerfile.j2 b/docker/kube/kube-apiserver/Dockerfile.j2
deleted file mode 100644
index c0918ce40..000000000
--- a/docker/kube/kube-apiserver/Dockerfile.j2
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}kube-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-
-ENV KUBERNETES_COMPONENT=kube-apiserver
-
-{% block kube_apiserver_header %}{% endblock %}
-
-{% block kube_apiserver_install %}
-RUN true \
-    && curl -L ${KUBERNETES_DOWNLOAD_ROOT}/${KUBERNETES_COMPONENT} -o /usr/bin/${KUBERNETES_COMPONENT} \
-    && chmod +x /usr/bin/${KUBERNETES_COMPONENT}
-{% endblock %}
-
-# Clear any customisation by Kolla to entrypoint & command
-ENTRYPOINT []
-CMD []
-
-{% block kube_apiserver_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/kube/kube-base/Dockerfile.j2 b/docker/kube/kube-base/Dockerfile.j2
deleted file mode 100644
index 02449df2e..000000000
--- a/docker/kube/kube-base/Dockerfile.j2
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-
-ENV KUBERNETES_VERSION=v1.11.1
-
-ENV KUBERNETES_DOWNLOAD_ROOT=https://storage.googleapis.com/kubernetes-release/release/${KUBERNETES_VERSION}/bin/linux/{{debian_arch}}
-
-{% block kube_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% block kube_base_footer %}{% endblock %}
diff --git a/docker/kube/kube-controller-manager/Dockerfile.j2 b/docker/kube/kube-controller-manager/Dockerfile.j2
deleted file mode 100644
index ae7fc7ffe..000000000
--- a/docker/kube/kube-controller-manager/Dockerfile.j2
+++ /dev/null
@@ -1,35 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}kube-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-
-ENV KUBERNETES_COMPONENT=kube-controller-manager
-
-{% block kube_controller_manager_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if base_package_type == 'rpm' %}
-   {% set ceph_support_packages = [
-        'ceph-common'
-    ] %}
-{% elif base_package_type == 'deb' %}
-   {% set ceph_support_packages = [
-        'ceph-common',
-        'python3-cephfs',
-        'python3-rados',
-        'python3-rbd'
-    ] %}
-{% endif %}
-{{ macros.install_packages(ceph_support_packages | customizable("packages")) }}
-
-{% 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}
-{% endblock %}
-
-# Clear any customisation by Kolla to entrypoint & command
-ENTRYPOINT []
-CMD []
-
-{% block kube_controller_manager_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/kube/kube-discovery/Dockerfile.j2 b/docker/kube/kube-discovery/Dockerfile.j2
deleted file mode 100644
index 09cf9ecbe..000000000
--- a/docker/kube/kube-discovery/Dockerfile.j2
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}kube-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-
-ENV KUBERNETES_COMPONENT=kube-discovery
-
-{% block kube_discovery_header %}{% endblock %}
-
-{% 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} \
-    && chmod +x /usr/local/bin/${KUBERNETES_COMPONENT}
-{% endblock %}
-
-# Clear any customisation by Kolla to entrypoint & command
-ENTRYPOINT []
-CMD []
-
-{% block kube_discovery_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/kube/kube-proxy/Dockerfile.j2 b/docker/kube/kube-proxy/Dockerfile.j2
deleted file mode 100644
index 56532e4a4..000000000
--- a/docker/kube/kube-proxy/Dockerfile.j2
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}kube-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-
-ENV KUBERNETES_COMPONENT=kube-proxy
-
-{% block kube_proxy_header %}{% endblock %}
-
-{% block kube_proxy_install %}
-RUN true \
-    && curl -L ${KUBERNETES_DOWNLOAD_ROOT}/${KUBERNETES_COMPONENT} -o /usr/bin/${KUBERNETES_COMPONENT} \
-    && chmod +x /usr/bin/${KUBERNETES_COMPONENT}
-{% endblock %}
-
-# Clear any customisation by Kolla to entrypoint & command
-ENTRYPOINT []
-CMD []
-
-{% block kube_proxy_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/kube/kube-scheduler/Dockerfile.j2 b/docker/kube/kube-scheduler/Dockerfile.j2
deleted file mode 100644
index 8f4adc061..000000000
--- a/docker/kube/kube-scheduler/Dockerfile.j2
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}kube-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-
-ENV KUBERNETES_COMPONENT=kube-scheduler
-
-{% block kube_scheduler_header %}{% endblock %}
-
-{% block kube_scheduler_install %}
-RUN true \
-    && curl -L ${KUBERNETES_DOWNLOAD_ROOT}/${KUBERNETES_COMPONENT} -o /usr/bin/${KUBERNETES_COMPONENT} \
-    && chmod +x /usr/bin/${KUBERNETES_COMPONENT}
-{% endblock %}
-
-# Clear any customisation by Kolla to entrypoint & command
-ENTRYPOINT []
-CMD []
-
-{% block kube_scheduler_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/kubernetes-entrypoint/Dockerfile.j2 b/docker/kubernetes-entrypoint/Dockerfile.j2
deleted file mode 100644
index 9056ee78b..000000000
--- a/docker/kubernetes-entrypoint/Dockerfile.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-
-{% block kubernetes_entrypoint_header %}{% endblock %}
-
-{% block kubernetes_entrypoint_install_binary %}
-RUN curl -Lo /usr/local/bin/kubernetes-entrypoint https://github.com/stackanetes/kubernetes-entrypoint/releases/download/v0.3.0/kubernetes-entrypoint \
-    && chmod 755 /usr/local/bin/kubernetes-entrypoint
-{% endblock %}
-
-{% block kubernetes_entrypoint_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-CMD /usr/local/bin/kubernetes-entrypoint
diff --git a/docker/kubetoolbox/Dockerfile.j2 b/docker/kubetoolbox/Dockerfile.j2
deleted file mode 100644
index 87481d102..000000000
--- a/docker/kubetoolbox/Dockerfile.j2
+++ /dev/null
@@ -1,29 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-
-{% block kubetoolbox_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% set kubetoolbox_packages = [
-   'ceph-common',
-   'ipmitool',
-   'jq'
-] %}
-
-{% if base_package_type == 'deb' %}
-     {% set kubetoolbox_packages = kubetoolbox_packages + [
-          'python3-cephfs',
-          'python3-rados',
-          'python3-rbd'
-       ] %}
-{% endif %}
-
-{{ macros.install_packages(kubetoolbox_packages | customizable("packages")) }}
-
-{% block kubetoolbox_install_kube_binary %}
-    {{ macros.install_kubectl() }}
-{% endblock %}
-
-{% block kubetoolbox_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/macros.j2 b/docker/macros.j2
index 0e4078ec9..aedb7b0b7 100644
--- a/docker/macros.j2
+++ b/docker/macros.j2
@@ -99,12 +99,6 @@ RUN apt-get update \
     {{ debian_fix_existing_user('opendaylight', 1) }}
 {% endmacro %}
 
-{% macro install_kubectl() %}
-    # 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.11.0/bin/linux/{{debian_arch}}/kubectl \
-        && chmod 755 /usr/bin/kubectl
-{% endmacro %}
-
 {% macro install_fluent_plugins(binary, plugins, chain=False) -%}
 {% if plugins is defined and plugins|length > 0 -%}
     {% if not chain -%} RUN {% endif -%}
diff --git a/docker/magnum/magnum-conductor/Dockerfile.j2 b/docker/magnum/magnum-conductor/Dockerfile.j2
index c06bac11a..5f065008c 100644
--- a/docker/magnum/magnum-conductor/Dockerfile.j2
+++ b/docker/magnum/magnum-conductor/Dockerfile.j2
@@ -21,7 +21,6 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
     {% endif %}
 {{ macros.install_packages(magnum_conductor_packages | customizable("packages")) }}
 
-{{ macros.install_kubectl() }}
 {% endif %}
 
 {% block magnum_conductor_footer %}{% endblock %}