Drop skydive

The project is not maintained anymore, last commit is 8th Jan 2022.

Change-Id: Iefbc3481925156dd267c696c8ab8b306637f5564

11 files changed, 6 insertions, 90 deletions

diff --git a/doc/source/contributor/release-management.rst b/doc/source/contributor/release-management.rst
index abf2a38bb..8006e1492 100644
--- a/doc/source/contributor/release-management.rst
+++ b/doc/source/contributor/release-management.rst
@@ -183,7 +183,6 @@ R-5: Cycle highlights deadline
   * openvswitch/OVN
   * prometheus (incl. exporters)
   * rabbitmq/erlang
-  * skydive
 
 R-2: Feature freeze
 -------------------
diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv
index 9eaab3769..fbd5fd136 100644
--- a/doc/source/matrix_aarch64.csv
+++ b/doc/source/matrix_aarch64.csv
@@ -51,7 +51,6 @@ rabbitmq,C,C,C
 redis,C,C,C
 sahara,C,C,C
 senlin,C,C,C
-skydive,N,N,N
 solum,C,C,C
 swift,C,C,C
 tacker,C,C,C
diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv
index 2b3996904..6b9df633c 100644
--- a/doc/source/matrix_x86.csv
+++ b/doc/source/matrix_x86.csv
@@ -52,7 +52,6 @@ rabbitmq,T,T,T
 redis,T,C,C
 sahara,C,C,C
 senlin,C,C,C
-skydive,C,C,C
 solum,C,C,C
 swift,T,T,C
 tacker,T,C,C
diff --git a/docker/skydive/skydive-agent/Dockerfile.j2 b/docker/skydive/skydive-agent/Dockerfile.j2
deleted file mode 100644
index 72cf1b21f..000000000
--- a/docker/skydive/skydive-agent/Dockerfile.j2
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}skydive-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block skydive_agent_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% block skydive_agent_install %}
-
-{% if base_package_type == 'rpm' %}
-
-    {% set skydive_agent_packages = ['openvswitch'] %}
-
-{% elif base_package_type == 'deb' %}
-
-    {% set skydive_agent_packages = ['openvswitch-common'] %}
-
-{% endif %}
-
-{{ macros.install_packages(skydive_agent_packages | customizable("packages")) }}
-
-{% endblock %}
-
-{% block skydive_agent_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/skydive/skydive-analyzer/Dockerfile.j2 b/docker/skydive/skydive-analyzer/Dockerfile.j2
deleted file mode 100644
index de265af51..000000000
--- a/docker/skydive/skydive-analyzer/Dockerfile.j2
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}skydive-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block skydive_analyzer_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% block skydive_analyzer_install %}{% endblock %}
-
-{% block skydive_analyzer_footer %}{% endblock %}
-
-{% block footer %}{% endblock %}
-
-USER skydive
diff --git a/docker/skydive/skydive-base/Dockerfile.j2 b/docker/skydive/skydive-base/Dockerfile.j2
deleted file mode 100644
index 70490a3fa..000000000
--- a/docker/skydive/skydive-base/Dockerfile.j2
+++ /dev/null
@@ -1,33 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block skydive_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.enable_extra_repos(['openvswitch']) }}
-{{ macros.configure_user(name='skydive') }}
-
-{% block skydive_version %}
-ARG skydive_version=0.28.0
-ARG skydive_url=https://github.com/skydive-project/skydive/releases/download/v${skydive_version}/skydive
-{% endblock %}
-
-{% block skydive_install %}
-
-{% if base_arch != 'x86_64' %}
-RUN echo 'image on {{ base_distro }} is not yet available on non x86_64 platforms' \
-    && /bin/false
-{% else %}
-RUN curl -o /usr/bin/skydive ${skydive_url} \
-    && chmod +x /usr/bin/skydive
-{% endif %}
-
-{% endblock %}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 644 /usr/local/bin/kolla_extend_start
-
-{% block skydive_base_footer %}{% endblock %}
diff --git a/docker/skydive/skydive-base/extend_start.sh b/docker/skydive/skydive-base/extend_start.sh
deleted file mode 100644
index 7d9bfb418..000000000
--- a/docker/skydive/skydive-base/extend_start.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d "/var/log/kolla/skydive" ]]; then
-    mkdir -p /var/log/kolla/skydive
-fi
-if [[ $(stat -c %a /var/log/kolla/skydive) != "755" ]]; then
-    chmod 755 /var/log/kolla/skydive
-fi
diff --git a/kolla/common/config.py b/kolla/common/config.py
index dca9e278c..5e5692d5e 100644
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -66,7 +66,6 @@ _PROFILE_OPTS = [
                     'proxysql',
                     'rabbitmq',
                     'redis',
-                    'skydive',
                     'storm',
                     'tgtd',
                 ],
diff --git a/kolla/common/users.py b/kolla/common/users.py
index c47528d93..fea97743d 100644
--- a/kolla/common/users.py
+++ b/kolla/common/users.py
@@ -249,7 +249,7 @@ USERS = {
         'uid': 42467,
         'gid': 42467,
     },
-    'skydive-user': {
+    'skydive-user': {  # unused user (skydive dropped)
         'uid': 42468,
         'gid': 42468,
     },
diff --git a/kolla/image/unbuildable.py b/kolla/image/unbuildable.py
index b401a812b..dc5183162 100644
--- a/kolla/image/unbuildable.py
+++ b/kolla/image/unbuildable.py
@@ -19,7 +19,6 @@ UNBUILDABLE_IMAGES = {
         "bifrost-base",      # someone need to get upstream working first
         "prometheus-msteams",  # no aarch64 binary
         "prometheus-mtail",  # no aarch64 binary
-        "skydive-base",      # no aarch64 binary
     },
 
     # Issues for SHA1 keys:
diff --git a/releasenotes/notes/drop-skydive-5b0dba2b7b12ee95.yaml b/releasenotes/notes/drop-skydive-5b0dba2b7b12ee95.yaml
new file mode 100644
index 000000000..8951b5a09
--- /dev/null
+++ b/releasenotes/notes/drop-skydive-5b0dba2b7b12ee95.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    ``skydive`` Kolla images have been dropped, the project is not active
+    anymore.