Merge "Remove deprecated images"

27 files changed, 7 insertions, 520 deletions

diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv
index 28a7c97ad..efc660a5d 100644
--- a/doc/source/matrix_aarch64.csv
+++ b/doc/source/matrix_aarch64.csv
@@ -1,6 +1,5 @@
 Image,CentOS,,Ubuntu,,Debian
 ,Binary,Source,Binary,Source,Binary,Source
-almanach (deprecated),N,C,N,C,N,C
 aodh,C,C,C,C,N,C
 barbican,C,C,C,C,N,C
 bifrost,N,C,N,N,N,N
@@ -16,9 +15,7 @@ congress,C,C,N,C,N,C
 cron,C,C,C,C,N,C
 cyborg,N,N,N,N,N,N
 designate,C,C,C,C,N,C
-dind (deprecated),C,C,C,C,N,C
 dnsmasq,C,C,C,C,N,C
-dragonflow (deprecated),N,C,N,C,N,C
 ec2-api,C,C,C,C,N,C
 elasticsearch,N,N,C,C,N,C
 etcd,C,C,C,C,N,C
@@ -30,7 +27,6 @@ grafana,C,C,C,C,N,C
 hacluster,N,N,C,C,N,C
 haproxy,C,C,C,C,N,C
 heat,C,C,C,C,N,C
-helm-repository (deprecated),C,C,C,C,N,C
 horizon,C,C,C,C,N,C
 influxdb,N,N,C,C,N,C
 ironic,C,C,C,C,N,C
@@ -43,9 +39,6 @@ keepalived,C,C,C,C,N,C
 keystone,C,C,C,C,N,C
 kibana,N,N,N,N,N,N
 kolla-toolbox,C,C,C,C,N,C
-kube (deprecated),C,C,C,C,N,C
-kubernetes-entrypoint (deprecated),C,C,C,C,N,C
-kubetoolbox (deprecated),C,C,C,C,N,C
 kuryr,N,C,N,C,N,C
 logstash,C,C,C,C,N,C
 magnum,C,C,C,C,N,C
diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv
index 2aa5fecb4..7a195d32c 100644
--- a/doc/source/matrix_x86.csv
+++ b/doc/source/matrix_x86.csv
@@ -1,6 +1,5 @@
 Image,CentOS,,Ubuntu,,Debian
 ,Binary,Source,Binary,Source,Binary,Source
-almanach (deprecated),N,C,N,C,N,C
 aodh,C,C,C,C,N,C
 barbican,C,T,C,C,N,C
 bifrost,N,T,N,C,N,N
@@ -16,9 +15,7 @@ congress,C,C,N,C,N,C
 cron,T,T,T,T,N,T
 cyborg,N,C,N,N,N,N
 designate,C,C,C,C,N,C
-dind (deprecated),C,C,C,C,N,C
 dnsmasq,T,T,C,T,N,C
-dragonflow (deprecated),N,C,N,C,N,C
 ec2-api,C,C,N,C,N,C
 elasticsearch,C,C,C,C,N,C
 etcd,C,T,C,T,N,C
@@ -30,7 +27,6 @@ grafana,C,C,C,C,N,C
 hacluster,C,C,C,C,N,C
 haproxy,T,T,T,T,N,C
 heat,T,T,N,T,N,T
-helm-repository (deprecated),C,C,C,C,N,C
 horizon,T,T,T,T,N,T
 influxdb,C,C,C,C,N,C
 ironic,T,T,C,T,N,C
@@ -43,9 +39,6 @@ keepalived,T,T,T,T,N,C
 keystone,T,T,T,T,N,T
 kibana,C,C,C,C,N,C
 kolla-toolbox,T,T,T,T,N,T
-kube (deprecated),C,C,C,C,N,C
-kubernetes-entrypoint (deprecated),C,C,C,C,N,C
-kubetoolbox (deprecated),C,C,C,C,N,C
 kuryr,N,T,N,T,N,C
 logstash,C,C,C,C,N,C
 magnum,C,C,C,C,N,C
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 %}
diff --git a/kolla/common/config.py b/kolla/common/config.py
index ac46a3c03..765a4803e 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -93,13 +93,11 @@ _PROFILE_OPTS = [
                 help='Main images'),
     cfg.ListOpt('aux',
                 default=[
-                    'almanach',
                     'aodh',
                     'blazar',
                     'cloudkitty',
                     'congress',
                     'designate',
-                    'dragonflow',
                     'ec2-api',
                     'freezer',
                     'gnocchi',
@@ -284,10 +282,6 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/requirements/'
                      'requirements-stable-train.tar.gz')},
-    'almanach-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/almanach/'
-                     'almanach-4.1.0.tar.gz')},
     'aodh-base': {
         'type': 'url',
         'location': ('$tarballs_base/aodh/'
@@ -332,10 +326,6 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/designate/'
                      'designate-9.0.0.tar.gz')},
-    'dragonflow-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/dragonflow/'
-                     'dragonflow-3.0.0.tar.gz')},
     'ec2-api': {
         'type': 'url',
         'location': ('$tarballs_base/ec2-api/'
@@ -1092,7 +1082,7 @@ USERS = {
         'uid': 42463,
         'gid': 42463,
     },
-    'dragonflow-user': {
+    'dragonflow-user': {  # unused user (dragonflow dropped)
         'uid': 42464,
         'gid': 42464,
     },
@@ -1136,7 +1126,7 @@ USERS = {
         'uid': 42474,
         'gid': 42474,
     },
-    'almanach-user': {
+    'almanach-user': {  # unused user (almanach dropped)
         'uid': 42475,
         'gid': 42475,
     },
diff --git a/kolla/image/build.py b/kolla/image/build.py
index 034133256..1ad51ee35 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -96,8 +96,6 @@ UNBUILDABLE_IMAGES = {
         "elasticsearch",     # no binary package
         "grafana",           # no binary package
         "kibana",            # no binary package
-        "kube-proxy",        # no binary
-        "helm-repository",   # no binary
         "monasca-grafana",   # no phantomJS
         "opendaylight",      # no binary package
         "prometheus-base",   # no ppc64le binaries
@@ -109,11 +107,9 @@ UNBUILDABLE_IMAGES = {
         "tripleoclient",
     },
     'binary': {
-        "almanach-base",
         "bifrost-base",
         "blazar-base",
         "cyborg-base",
-        "dragonflow-base",
         "freezer-base",
         "karbor-base",
         "kuryr-base",
diff --git a/releasenotes/notes/remove-deprecated-images-ussuri-28547f7179202a9d.yaml b/releasenotes/notes/remove-deprecated-images-ussuri-28547f7179202a9d.yaml
new file mode 100644
index 000000000..130542b13
--- /dev/null
+++ b/releasenotes/notes/remove-deprecated-images-ussuri-28547f7179202a9d.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Images deprecated in the Train cycle have been removed.
+    These include almanach, dind, dragonflow, helm and kubernetes images.