Revert "feat: [AAP-59028] cleanup old redis artifacts (#321)" (#327)

This reverts commit 4c9fd0c.

Author: kaiokmo

README.md

@@ -268,7 +268,6 @@ spec:
 - [Deploy a Specific Version of EDA](./docs/user-guide/advanced-configuration/deploying-a-specific-version.md)
 - [Trusting a Custom Certificate Authority](./docs/user-guide/advanced-configuration/trusting-a-custom-certificate-authority.md)
 - [Database Configuration](./docs/user-guide/database-configuration.md)
-- [Redis Removal Notice](./docs/user-guide/redis-configuration.md)
 
 ## Maintainers Docs
 

docs/upgrade/upgrading.md

@@ -48,23 +48,6 @@ In the event you need to recover the backup see the [restore role documentation]
 **Note**: Do not delete the namespace/project, as that will delete the backup and the backup's PVC as well.
 
 
-#### Redis Removal
-
-Starting with this version, the EDA operator **no longer deploys or supports Redis**. EDA now uses [dispatcherd](https://github.com/ansible/dispatcherd), a PostgreSQL `pg_notify`-based task queuing system that eliminates the need for a separate Redis instance.
-
-**What happens automatically during the upgrade:**
-
-- The operator deletes any existing managed Redis Deployment (`<name>-redis`), Service (`<name>-redis-svc`), and Secret (`<name>-redis-configuration`).
-- No data migration is required — Redis was used only for transient message queuing (`emptyDir` storage), and all durable task state is persisted in PostgreSQL.
-
-**What you need to do:**
-
-- **Remove the `redis` section from your EDA CR spec when convenient.** If your CR still contains a `redis` section, the operator will log a deprecation warning and ignore it — the upgrade will proceed normally. You should remove the `redis:` block at your earliest convenience.
-- **Decommission any external Redis instance** that was dedicated to EDA. No EDA component connects to Redis anymore.
-- The `redis_image` and `redis_image_version` CR fields have also been removed.
-
-For more details, see the [Redis Removal Notice](../user-guide/redis-configuration.md).
-
 #### PostgreSQL Upgrade Considerations
 
 If there is a PostgreSQL major version upgrade, after the data directory on the PVC is migrated to the new version, the old PVC is kept by default.

docs/user-guide/advanced-configuration/assigning-eda-pods-to-specific-nodes.md

@@ -2,7 +2,7 @@
 
 You can constrain the EDA pods created by the operator to run on a certain subset of nodes. `node_selector` and `tolerations` contrain the EDA pods to run only on the nodes that match the specified key/value pairs. 
 
-Each component of EDA has its own `node_selector` and `tolerations` values. The supported components are `ui`, `api`, `default_worker`, `activation_worker`, `worker` and `database`.
+Each component of EDA has its own `node_selector` and `tolerations` values. The supported components are `ui`, `api`, `default_worker`, `activation_worker`, `worker`, `redis` and `database`.
 
 | Name | Description | Type | Default |
 |---|---|---|---|

docs/user-guide/advanced-configuration/deploying-a-specific-version.md

@@ -10,6 +10,8 @@ There are a few variables that are customizable for eda the image management.
 | image_web_version      | Image version to pull     | value of DEFAULT_EDA_UI_VERSION or main |
 | image_pull_policy      | The pull policy to adopt  | IfNotPresent                            |
 | image_pull_secrets     | The pull secrets to use   | None                                    |
+| redis_image            | Path of the image to pull | redis                                   |
+| redis_image_version    | Image version to pull     | c9s                                     |
 | postgres_image         | Path of the image to pull | postgres                                |
 | postgres_image_version | Image version to pull     | latest                                  |
 

docs/user-guide/redis-configuration.md

@@ -1,61 +1,48 @@
-### Redis Removal Notice
+### Redis Configuration
 
-> **Important:** Starting with this version of the EDA operator, Redis is **no longer deployed or supported**.
-> EDA now uses [dispatcherd](https://github.com/ansible/dispatcherd), a PostgreSQL `pg_notify`-based task queuing system, which eliminates the need for a separate Redis instance entirely.
+#### Redis Version
 
-#### Background
+The default Redis version for the version of EDA bundled with the latest version of the eda-server-operator is Redis 6.
 
-Previous versions of the EDA operator deployed a managed Redis instance (or accepted a user-provided one via `redis.redis_secret`) for task queuing through [RQ (Redis Queue)](https://python-rq.org/). With the introduction of dispatcherd, all task orchestration is now handled natively through PostgreSQL, which EDA already requires for its database.
+#### External Redis Service
 
-#### What Changed
+EDA can be configured to use an external redis cache by creating a secret which holds the configuration values for the external Redis instance.
 
-| Before (Redis)                              | After (Dispatcherd)                              |
-|---------------------------------------------|--------------------------------------------------|
-| Managed Redis Deployment provisioned        | No Redis resources created                       |
-| `spec.redis` and `spec.redis.redis_secret`  | Removed from the CRD; ignored if still present   |
-| `redis_image` / `redis_image_version`       | Removed from the CRD                             |
-| `EDA_MQ_*` environment variables            | Removed from all deployment templates            |
-| RQ-based task queuing (`rqworker`)          | Dispatcherd (`aap-eda-manage dispatcherd`)       |
-| External Redis (BYO) supported              | Not supported; use PostgreSQL                    |
+The secret should be formatted as follows:
 
-#### Upgrading from a Previous Version
+```yaml
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: <resourcename>-redis-configuration
+  namespace: <target namespace>
+stringData:
+  host: <external ip or url resolvable by the cluster>
+  port: <external port, this usually defaults to 6370>
+  redis_tls: <true / false to enable TLS>
+  database: <desired database name>
+  cluster_endpoint: <optional - see Redis Cluster section>
+  username: <username to connect as>
+  password: <password to connect with>
+  type: unmanaged
+type: Opaque
+```
 
-When upgrading from an operator version that included Redis:
+The secret should be specified on the EDA customer resource using the following:
 
-1. **No data migration is required.** Redis was used only for transient message queuing (with `emptyDir` storage). All durable task state has always been persisted in PostgreSQL.
+```yaml
+---
+spec:
+  ...
+  redis:
+    redis_secret: <name-of-your-secret>
+```
 
-2. **Legacy Redis resources are cleaned up automatically.** The operator will delete any existing Redis Deployment, Service, and managed Secret (`<name>-redis-configuration`) during the upgrade reconciliation.
+#### Redis Cluster
 
-3. **Remove `redis` from your EDA Custom Resource when convenient.** If your CR spec still contains a `redis` section (e.g. `redis.redis_secret`), the operator will **log a deprecation warning** and ignore the configuration entirely. The upgrade will proceed normally. You should remove the `redis:` block from your CR at your earliest convenience:
+The format of the cluster_endpoint field is:
 
-   ```yaml
-   # Before (deprecated — ignored by the operator)
-   spec:
-     redis:
-       redis_secret: my-redis-secret
+"<host>:<port>[,<host>:<port>]*"
 
-   # After (recommended)
-   spec:
-     # redis section removed — no replacement needed
-   ```
-
-4. **External (BYO) Redis is no longer used.** If you were providing your own Redis via a secret, you can safely decommission that Redis instance once the EDA operator upgrade is complete. No EDA component connects to Redis anymore.
-
-#### Task Queuing Architecture
-
-EDA's background task processing is now powered entirely by **dispatcherd**:
-
-- **Message broker:** PostgreSQL [`pg_notify` / `LISTEN`](https://www.postgresql.org/docs/current/sql-notify.html) channels replace the Redis pub/sub layer.
-- **Task workers:** The `aap-eda-manage dispatcherd` management command replaces `aap-eda-manage rqworker`. A backward-compatible `rqworker` wrapper exists in eda-server that forwards to dispatcherd.
-- **Scheduler:** Periodic task scheduling is integrated into the dispatcherd workers; the separate scheduler pod has been removed.
-- **Health checks:** Dispatcherd exposes worker health checks through the EDA status API endpoint.
-
-No additional configuration is needed — dispatcherd uses the same PostgreSQL database that EDA already requires, with connection details sourced from `database.database_secret`.
-
-#### Q&A
-
-**Q: Can I still use Redis with EDA?**
-A: No. The `spec.redis` CRD fields have been removed. If they are still present in your CR (e.g. from a previous version), the operator will ignore them and log a deprecation warning.
-
-**Q: Do I need to change my PostgreSQL sizing?**
-A: In most deployments, no. Dispatcherd's use of `pg_notify` adds negligible overhead.
+This field is required if the external redis service is a cluster.

roles/eda/tasks/deploy_eda.yml

@@ -94,30 +94,6 @@
     namespace: "{{ ansible_operator_meta.namespace }}"
     state: absent
 
-- name: Remove legacy Redis deployment
-  k8s:
-    api_version: apps/v1
-    kind: Deployment
-    name: "{{ ansible_operator_meta.name }}-redis"
-    namespace: "{{ ansible_operator_meta.namespace }}"
-    state: absent
-
-- name: Remove legacy Redis service
-  k8s:
-    api_version: v1
-    kind: Service
-    name: "{{ ansible_operator_meta.name }}-redis-svc"
-    namespace: "{{ ansible_operator_meta.namespace }}"
-    state: absent
-
-- name: Remove legacy Redis secret
-  k8s:
-    api_version: v1
-    kind: Secret
-    name: "{{ ansible_operator_meta.name }}-redis-configuration"
-    namespace: "{{ ansible_operator_meta.namespace }}"
-    state: absent
-
 - name: Check for API Pod
   k8s_info:
     kind: Pod

roles/eda/tasks/main.yml

@@ -4,21 +4,6 @@
 - name: Combine default and custom vars for each component
   include_tasks: combine_defaults.yml
 
-- name: Warn if user still references redis configuration
-  ansible.builtin.debug:
-    msg: >-
-      [DEPRECATION WARNING] Redis configuration detected in the EDA custom
-      resource spec but Redis is no longer used by EDA. The 'redis' section
-      (including 'redis.redis_secret') will be ignored. EDA now uses
-      dispatcherd (backed by PostgreSQL) for task queuing. Please remove
-      the 'redis' section from your EDA custom resource spec at your
-      earliest convenience. No data migration from Redis is required as
-      task state is persisted in PostgreSQL.
-  when:
-    - redis is defined
-    - redis is mapping
-    - redis | length > 0
-
 - name: Configure cluster
   include_role:
     name: common