diff options
| author | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2019-11-12 13:14:22 +0100 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2019-11-13 09:17:34 +0100 |
| commit | a20fa84e29a1f3e7afb15d008c05f37aa58ee3c0 (patch) | |
| tree | 8bbaa798055787358a8436b5a3b352ab28ab7d9c /docker/kube | |
| parent | dcbc0bd89a24cd93aa8fc46a644c9d4c19dad4d5 (diff) | |
| download | kolla-a20fa84e29a1f3e7afb15d008c05f37aa58ee3c0.tar.gz kolla-a20fa84e29a1f3e7afb15d008c05f37aa58ee3c0.zip | |
Remove deprecated images
Change-Id: I2fe57f7cd79724fa8a36bd702d75b013a68ecd1b
Diffstat (limited to 'docker/kube')
| -rw-r--r-- | docker/kube/kube-apiserver/Dockerfile.j2 | 19 | ||||
| -rw-r--r-- | docker/kube/kube-base/Dockerfile.j2 | 12 | ||||
| -rw-r--r-- | docker/kube/kube-controller-manager/Dockerfile.j2 | 35 | ||||
| -rw-r--r-- | docker/kube/kube-discovery/Dockerfile.j2 | 20 | ||||
| -rw-r--r-- | docker/kube/kube-proxy/Dockerfile.j2 | 19 | ||||
| -rw-r--r-- | docker/kube/kube-scheduler/Dockerfile.j2 | 19 |
6 files changed, 0 insertions, 124 deletions
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 %} |
