From 880573e251dd848ff0dfa8aba6259b39fccc107b Mon Sep 17 00:00:00 2001
From: Szymon Datko <sdatko@redhat.com>
Date: Thu, 13 Jun 2024 21:19:32 +0200
Subject: [PATCH] Drop Redis

As per [1] it is apparently no longer a thing,
hence removing all references from this repository.

[1] https://github.com/openstack-k8s-operators/openstack-operator/pull/748
---
 dt/uni01alpha/kustomization.yaml                  | 12 ------------
 dt/uni05epsilon/kustomization.yaml                | 15 ---------------
 examples/dt/uni01alpha/README.md                  |  2 +-
 .../uni01alpha/control-plane/service-values.yaml  |  3 ---
 examples/dt/uni05epsilon/README.md                |  1 -
 .../control-plane/service-values.yaml             |  3 ---
 lib/control-plane/openstackcontrolplane.yaml      |  2 --
 7 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/dt/uni01alpha/kustomization.yaml b/dt/uni01alpha/kustomization.yaml
index 7dc1fb8ec..bc539b9f7 100644
--- a/dt/uni01alpha/kustomization.yaml
+++ b/dt/uni01alpha/kustomization.yaml
@@ -249,18 +249,6 @@ replacements:
         options:
           create: true
 
-  - source:
-      kind: ConfigMap
-      name: service-values
-      fieldPath: data.redis.enabled
-    targets:
-      - select:
-          kind: OpenStackControlPlane
-        fieldPaths:
-          - spec.redis.enabled
-        options:
-          create: true
-
   - source:
       kind: ConfigMap
       name: service-values
diff --git a/dt/uni05epsilon/kustomization.yaml b/dt/uni05epsilon/kustomization.yaml
index d407a6de0..e08dd700c 100644
--- a/dt/uni05epsilon/kustomization.yaml
+++ b/dt/uni05epsilon/kustomization.yaml
@@ -357,21 +357,6 @@ replacements:
         fieldPaths:
           - spec.config
 
-  #
-  # Redis
-  #
-  - source:
-      kind: ConfigMap
-      name: service-values
-      fieldPath: data.redis.enabled
-    targets:
-      - select:
-          kind: OpenStackControlPlane
-        fieldPaths:
-          - spec.redis.enabled
-        options:
-          create: true
-
   #
   # Swift
   #
diff --git a/examples/dt/uni01alpha/README.md b/examples/dt/uni01alpha/README.md
index 87002186d..bef2a7ba5 100644
--- a/examples/dt/uni01alpha/README.md
+++ b/examples/dt/uni01alpha/README.md
@@ -67,7 +67,7 @@ work properly and can be deployed with any/default configuration.
 | Ceilometer       | needed by Telemetry        |
 | Heat             | needed by Telemetry        |
 | Prometheus       | needed by Telemetry        |
-| Redis            | needed by Octavia          |
+
 
 ### Additional configuration
 
diff --git a/examples/dt/uni01alpha/control-plane/service-values.yaml b/examples/dt/uni01alpha/control-plane/service-values.yaml
index 1bfe56fc0..6328503e9 100644
--- a/examples/dt/uni01alpha/control-plane/service-values.yaml
+++ b/examples/dt/uni01alpha/control-plane/service-values.yaml
@@ -80,9 +80,6 @@ data:
   heat:
     enabled: true
 
-  redis:
-    enabled: true
-
   telemetry:
     enabled: true
     metricStorage:
diff --git a/examples/dt/uni05epsilon/README.md b/examples/dt/uni05epsilon/README.md
index c3412def7..a8543c240 100644
--- a/examples/dt/uni05epsilon/README.md
+++ b/examples/dt/uni05epsilon/README.md
@@ -66,7 +66,6 @@ to work properly and can be deployed with any/default configuration.
 | ---------------- |--------------------------- |
 | Nova             | needed by scenario testing |
 | Keystone         | needed by all services     |
-| Redis            | needed by Octavia          |
 
 
 ### Additional configuration
diff --git a/examples/dt/uni05epsilon/control-plane/service-values.yaml b/examples/dt/uni05epsilon/control-plane/service-values.yaml
index 4d1bb2484..813b1b57c 100644
--- a/examples/dt/uni05epsilon/control-plane/service-values.yaml
+++ b/examples/dt/uni05epsilon/control-plane/service-values.yaml
@@ -117,8 +117,5 @@ data:
       nicMappings:
         - octavia: octbr
 
-  redis:
-    enabled: true
-
   swift:
     enabled: true
diff --git a/lib/control-plane/openstackcontrolplane.yaml b/lib/control-plane/openstackcontrolplane.yaml
index 01c4ce7da..77fe1bfa6 100644
--- a/lib/control-plane/openstackcontrolplane.yaml
+++ b/lib/control-plane/openstackcontrolplane.yaml
@@ -183,8 +183,6 @@ spec:
         replicas: 3
       rabbitmq-cell1:
         replicas: 3
-  redis:
-    enabled: false
   secret: osp-secret
   storageClass: _replaced_
   swift: