Merge pull request #289 from sdatko/redis

Drop Redis As per [1] it is apparently no longer a thing, hence removing all references from this repository. [1] openstack-k8s-operators/openstack-operator#748 Reviewed-by: Andrew Bays <andrew.bays@gmail.com>
openstack-k8s-operators · Jun 14, 2024 · 4abe0e7 · 4abe0e7
2 parents b40e104 + 880573e
commit 4abe0e7
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 37 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -183,8 +183,6 @@ spec:
         replicas: 3
       rabbitmq-cell1:
         replicas: 3
-  redis:
-    enabled: false
   secret: osp-secret
   storageClass: _replaced_
   swift: