redis: Drop redis and redis-sentinel images

We switched to Valkey

Change-Id: Ic40fecb87dd3eaf67eb1d3088978d462ff5b4320
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>

12 files changed, 10 insertions, 113 deletions

diff --git a/README.rst b/README.rst
index 4af919296..a8cf66238 100644
--- a/README.rst
+++ b/README.rst
@@ -133,7 +133,7 @@ Kolla provides images to deploy the following infrastructure components:
   direct messaging back end for communication between services.
 - `RabbitMQ <https://www.rabbitmq.com/>`__ as a broker messaging back end for
   communication between services.
-- `Redis Sentinel <https://redis.io/topics/sentinel>`__ provides high availability for redis
+- `Valkey Sentinel <https://valkey.io/topics/sentinel>`__ provides high availability for valkey
   along with collateral tasks such as monitoring, notification and acts as configuration
   provider for clients.
 - `Telegraf <https://www.docs.influxdata.com/telegraf/>`__ as a plugin-driven server
diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv
index 028bba2c2..04e94f169 100644
--- a/doc/source/matrix_aarch64.csv
+++ b/doc/source/matrix_aarch64.csv
@@ -46,11 +46,11 @@ ovsdpdk,N,U,U
 placement,U,U,U
 prometheus,U,U,U
 rabbitmq,U,U,U
-redis,U,U,U
 skyline,U,U,U
 tacker,U,U,U
 telegraf,N,N,N
 tgtd,U,U,U
 trove,U,U,U
+valkey,U,U,U
 watcher,U,U,U
 zun,U,U,U
diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv
index 14c37597d..738475b61 100644
--- a/doc/source/matrix_x86.csv
+++ b/doc/source/matrix_x86.csv
@@ -47,12 +47,12 @@ ovsdpdk,N,U,U
 placement,T,T,T
 prometheus,U,U,U
 rabbitmq,T,T,T
-redis,T,U,U
 skyline,U,U,U
 swift,T,T,U
 tacker,T,U,U
 telegraf,U,U,U
 tgtd,N,T,U
 trove,U,U,U
+valkey,T,U,U
 watcher,U,U,U
 zun,T,T,U
diff --git a/docker/redis/redis-base/Dockerfile.j2 b/docker/redis/redis-base/Dockerfile.j2
deleted file mode 100644
index 89dccd258..000000000
--- a/docker/redis/redis-base/Dockerfile.j2
+++ /dev/null
@@ -1,17 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block redis_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='redis', homedir='/run/redis') }}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 644 /usr/local/bin/kolla_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block redis_base_footer %}{% endblock %}
diff --git a/docker/redis/redis-base/extend_start.sh b/docker/redis/redis-base/extend_start.sh
deleted file mode 100644
index f5f12ac70..000000000
--- a/docker/redis/redis-base/extend_start.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d "/var/log/kolla/redis" ]]; then
-    mkdir -p /var/log/kolla/redis
-fi
-
-if [[ $(stat -c %a /var/log/kolla/redis) != "755" ]]; then
-    chmod 755 /var/log/kolla/redis
-fi
diff --git a/docker/redis/redis-sentinel/Dockerfile.j2 b/docker/redis/redis-sentinel/Dockerfile.j2
deleted file mode 100644
index 83fc60df0..000000000
--- a/docker/redis/redis-sentinel/Dockerfile.j2
+++ /dev/null
@@ -1,25 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}redis-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block redis_sentinel_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if base_package_type == 'rpm' %}
-    {% set redis_sentinel_packages = ['redis'] %}
-{% elif base_package_type == 'deb' %}
-    {% set redis_sentinel_packages = ['redis-sentinel'] %}
-{% endif %}
-{{ macros.install_packages(redis_sentinel_packages | customizable("packages")) }}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 644 /usr/local/bin/kolla_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block redis_sentinel_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER redis
diff --git a/docker/redis/redis-sentinel/extend_start.sh b/docker/redis/redis-sentinel/extend_start.sh
deleted file mode 100644
index 9044f3990..000000000
--- a/docker/redis/redis-sentinel/extend_start.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d "/var/log/kolla/redis" ]]; then
-    mkdir -p /var/log/kolla/redis
-fi
-
-if [[ $(stat -c %a /var/log/kolla/redis) != "755" ]]; then
-    chmod 755 /var/log/kolla/redis
-fi
-
-# The CONFIG REWRITE command rewrites the redis.conf
-# file the server was started with, applying the minimal
-# changes needed to make it reflect the configuration
-# currently used by the server, which may be different
-# compared to the original one because of the use of
-# the CONFIG SET command.
-#
-# https://redis.io/commands/config-rewrite/
-#
-# Because of above behaviour it's needed to
-# hack kolla's CMD.
-#
-# Without this hack
-# /usr/local/bin/kolla_set_configs --check
-# is always reporting changed.
-#
-# Therefore redis-sentinel is always restarted
-# even if configuration is not changed from
-# kolla-ansible side.
-if [ ! -z "${REDIS_CONF}" ] && [ ! -z ${REDIS_GEN_CONF} ]; then
-    cp ${REDIS_CONF} ${REDIS_GEN_CONF}
-fi
diff --git a/docker/redis/redis/Dockerfile.j2 b/docker/redis/redis/Dockerfile.j2
deleted file mode 100644
index 7e5ce923b..000000000
--- a/docker/redis/redis/Dockerfile.j2
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}redis-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block redis_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if base_package_type == 'rpm' %}
-    {% set redis_packages = ['redis'] %}
-{% elif base_package_type == 'deb' %}
-    {% set redis_packages = ['redis-server'] %}
-{% endif %}
-{{ macros.install_packages(redis_packages | customizable("packages")) }}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block redis_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER redis
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 2ec2194ac..559fbbfa3 100644
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -64,9 +64,9 @@ _PROFILE_OPTS = [
                     'openvswitch',
                     'proxysql',
                     'rabbitmq',
-                    'redis',
                     'storm',
                     'tgtd',
+                    'valkey',
                 ],
                 help='Infra images'),
     cfg.ListOpt('main',
@@ -99,10 +99,10 @@ _PROFILE_OPTS = [
                     'masakari',
                     'mistral',
                     'octavia',
-                    'redis',
                     'tacker',
                     'telegraf',
                     'trove',
+                    'valkey',
                     'zookeeper',
                     'zun',
                 ],
diff --git a/kolla/common/users.py b/kolla/common/users.py
index de8fc315c..ec21b0658 100644
--- a/kolla/common/users.py
+++ b/kolla/common/users.py
@@ -217,7 +217,7 @@ USERS = {
         'uid': 42459,
         'gid': 42459,
     },
-    'redis-user': {
+    'redis-user': {  # unused user (redis dropped)
         'uid': 42460,
         'gid': 42460,
     },
diff --git a/kolla/image/unbuildable.py b/kolla/image/unbuildable.py
index 997b4b86b..d117ba0a7 100644
--- a/kolla/image/unbuildable.py
+++ b/kolla/image/unbuildable.py
@@ -26,7 +26,6 @@ UNBUILDABLE_IMAGES = {
         "hacluster-pcs",         # Missing crmsh package
         "nova-spicehtml5proxy",  # Missing spicehtml5 package
         "ovsdpdk",               # Not supported on CentOS
-        "redis-base",            # Missing in CS10
         "telegraf",              # CS10 no opstools repo
         "tgtd",                  # Not supported on CentOS
     },
@@ -41,7 +40,6 @@ UNBUILDABLE_IMAGES = {
         "hacluster-pcs",         # Missing crmsh package
         "nova-spicehtml5proxy",  # Missing spicehtml5 package
         "ovsdpdk",               # Not supported on CentOS
-        "redis-base",            # Missing in Rocky10
         "telegraf",              # CS10 no opstools repo
         "tgtd",                  # Not supported on CentOS
     },
diff --git a/releasenotes/notes/drop-redis-d286ca1237747c48.yaml b/releasenotes/notes/drop-redis-d286ca1237747c48.yaml
new file mode 100644
index 000000000..9710a37a2
--- /dev/null
+++ b/releasenotes/notes/drop-redis-d286ca1237747c48.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    ``redis`` container image has been dropped due to migration to ``valkey``.