feat: [AAP-46540] Remove redis from operator

config/crd/bases/eda.ansible.com_edas.yaml

@@ -41,8 +41,6 @@ spec:
                 message: "Both image and image_version must be set when required"
               - rule: "has(self.image_web) && has(self.image_web_version) || !has(self.image_web) && !has(self.image_web_version)"
                 message: "Both image_web and image_web_version must be set when required"
-              - rule: "has(self.redis_image) && has(self.redis_image_version) || !has(self.redis_image) && !has(self.redis_image_version)"
-                message: "Both redis_image and redis_image_version must be set when required"
               - rule: "has(self.postgres_image) && has(self.postgres_image_version) || !has(self.postgres_image) && !has(self.postgres_image_version)"
                 message: "Both postgres_image and postgres_image_version must be set when required"
             properties:
@@ -96,12 +94,6 @@ spec:
               image_web_version:
                 description: UI container image tag or version to use
                 type: string
-              redis_image:
-                description: Registry path to Redis container image to use
-                type: string
-              redis_image_version:
-                description: Redis container image tag or version to use
-                type: string
               api:
                 description: Defines desired state of eda-api resources
                 properties:
@@ -2106,164 +2098,6 @@ spec:
                       type: object
                     type: array
                 type: object
-              redis:
-                description: 'Defines desired state of cache resources'
-                properties:
-                  redis_secret:
-                    description: Secret where the redis configuration can be found. Set this to us your own external Redis cache. If not specified, this secret will be generated and EDA will not create a managed Redis pod.
-                    type: string
-                  replicas:
-                    description: 'Defines Redis Deployment replicas'
-                    format: int32
-                    type: integer
-                    default: 1
-                    minimum: 0
-                    maximum: 1
-                  node_selector:
-                    additionalProperties:
-                      type: string
-                    description: NodeSelector for the EDA pods.
-                    type: object
-                  resource_requirements:
-                    description: Resource requirements for the Redis container
-                    properties:
-                      claims:
-                        description: "Claims lists the names of resources, defined
-                          in spec.resourceClaims, that are used by this container.
-                          \n This is an alpha field and requires enabling the DynamicResourceAllocation
-                          feature gate. \n This field is immutable."
-                        items:
-                          description: ResourceClaim references one entry in PodSpec.ResourceClaims.
-                          properties:
-                            name:
-                              description: Name must match the name of one entry in
-                                pod.spec.resourceClaims of the Pod where this field
-                                is used. It makes that resource available inside a
-                                container.
-                              type: string
-                          required:
-                          - name
-                          type: object
-                        type: array
-                        x-kubernetes-list-map-keys:
-                        - name
-                        x-kubernetes-list-type: map
-                      limits:
-                        additionalProperties:
-                          anyOf:
-                          - type: integer
-                          - type: string
-                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                          x-kubernetes-int-or-string: true
-                        description: 'Limits describes the maximum amount of compute
-                          resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
-                        type: object
-                      requests:
-                        additionalProperties:
-                          anyOf:
-                          - type: integer
-                          - type: string
-                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                          x-kubernetes-int-or-string: true
-                        description: 'Requests describes the minimum amount of compute
-                          resources required. If Requests is omitted for a container,
-                          it defaults to Limits if that is explicitly specified, otherwise
-                          to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
-                        type: object
-                    type: object
-                  strategy:
-                    description: The deployment strategy to use to replace existing
-                      pods with new ones.
-                    properties:
-                      rollingUpdate:
-                        description: 'Rolling update config params. Present only if
-                          DeploymentStrategyType = RollingUpdate. --- TODO: Update
-                          this to follow our convention for oneOf, whatever we decide
-                          it to be.'
-                        properties:
-                          maxSurge:
-                            anyOf:
-                            - type: integer
-                            - type: string
-                            description: 'The maximum number of pods that can be scheduled
-                              above the desired number of pods. Value can be an absolute
-                              number (ex: 5) or a percentage of desired pods (ex:
-                              10%). This can not be 0 if MaxUnavailable is 0. Absolute
-                              number is calculated from percentage by rounding up.
-                              Defaults to 25%. Example: when this is set to 30%, the
-                              new ReplicaSet can be scaled up immediately when the
-                              rolling update starts, such that the total number of
-                              old and new pods do not exceed 130% of desired pods.
-                              Once old pods have been killed, new ReplicaSet can be
-                              scaled up further, ensuring that total number of pods
-                              running at any time during the update is at most 130%
-                              of desired pods.'
-                            x-kubernetes-int-or-string: true
-                          maxUnavailable:
-                            anyOf:
-                            - type: integer
-                            - type: string
-                            description: 'The maximum number of pods that can be unavailable
-                              during the update. Value can be an absolute number (ex:
-                              5) or a percentage of desired pods (ex: 10%). Absolute
-                              number is calculated from percentage by rounding down.
-                              This can not be 0 if MaxSurge is 0. Defaults to 25%.
-                              Example: when this is set to 30%, the old ReplicaSet
-                              can be scaled down to 70% of desired pods immediately
-                              when the rolling update starts. Once new pods are ready,
-                              old ReplicaSet can be scaled down further, followed
-                              by scaling up the new ReplicaSet, ensuring that the
-                              total number of pods available at all times during the
-                              update is at least 70% of desired pods.'
-                            x-kubernetes-int-or-string: true
-                        type: object
-                      type:
-                        description: Type of deployment. Can be "Recreate" or "RollingUpdate".
-                          Default is RollingUpdate.
-                        type: string
-                    type: object
-                  tolerations:
-                    description: Node tolerations for the EDA pods.
-                    items:
-                      description: The pod this Toleration is attached to tolerates
-                        any taint that matches the triple <key,value,effect> using
-                        the matching operator <operator>.
-                      properties:
-                        effect:
-                          description: Effect indicates the taint effect to match.
-                            Empty means match all taint effects. When specified, allowed
-                            values are NoSchedule, PreferNoSchedule and NoExecute.
-                          type: string
-                        key:
-                          description: Key is the taint key that the toleration applies
-                            to. Empty means match all taint keys. If the key is empty,
-                            operator must be Exists; this combination means to match
-                            all values and all keys.
-                          type: string
-                        operator:
-                          description: Operator represents a key's relationship to
-                            the value. Valid operators are Exists and Equal. Defaults
-                            to Equal. Exists is equivalent to wildcard for value,
-                            so that a pod can tolerate all taints of a particular
-                            category.
-                          type: string
-                        tolerationSeconds:
-                          description: TolerationSeconds represents the period of
-                            time the toleration (which must be of effect NoExecute,
-                            otherwise this field is ignored) tolerates the taint.
-                            By default, it is not set, which means tolerate the taint
-                            forever (do not evict). Zero and negative values will
-                            be treated as 0 (evict immediately) by the system.
-                          format: int64
-                          type: integer
-                        value:
-                          description: Value is the taint value the toleration matches
-                            to. If the operator is Exists, the value should be empty,
-                            otherwise just a regular string.
-                          type: string
-                      type: object
-                    type: array
-                type: object
               database:
                 description: The EDA PostgreSQL database StatefulSet
                 properties:

config/manifests/bases/eda-server-operator.clusterserviceversion.yaml

@@ -378,16 +378,6 @@ spec:
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:advanced
         - urn:alm:descriptor:com.tectonic.ui:hidden
-      - displayName: Redis Image
-        path: redis_image
-        x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-      - displayName: Redis Image Version
-        path: redis_image_version
-        x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
       - description: Defines desired state of eda-api deployment resources
         displayName: API deployment configuration
         path: api
@@ -596,42 +586,6 @@ spec:
         path: activation_worker.topology_spread_constraints
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:advanced
-      - description: Defines desired state of redis deployment resources
-        displayName: Redis deployment configuration
-        path: redis
-        x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-      - displayName: External redis configuration secret
-        path: redis.redis_secret
-        x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:io.kubernetes:Secret
-      - description: The number of redis replicas.
-        displayName: Replicas
-        path: redis.replicas
-        x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:podCount
-      - displayName: Node Selector
-        path: redis.node_selector
-        x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-      - description: Deployment strategy to use to replace existing pods with new
-          ones.
-        displayName: Strategy
-        path: redis.strategy
-        x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:updateStrategy
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-      - displayName: Redis deployment resource requirements
-        path: redis.resource_requirements
-        x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:resourceRequirements
-      - description: Node tolerations for the Redis pods.
-        displayName: Tolerations
-        path: redis.tolerations
-        x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
       - displayName: Service Type
         path: service_type
         x-descriptors:

config/samples/eda_v1alpha1_eda.yaml

@@ -37,12 +37,6 @@ spec:
       requests:
         cpu: 100m
         memory: 256Mi
-  redis:
-    replicas: 1
-    resource_requirements:
-      requests:
-        cpu: 150m
-        memory: 256Mi
   database:
     resource_requirements:
       requests:

roles/backup/tasks/secrets.yml

@@ -15,7 +15,6 @@
     - ldap_cacert_secret
     - bundle_cacert_secret
     - ee_pull_credentials_secret
-    - redis_secret
 
 # image_pull_secret is deprecated in favor of image_pull_secrets
 - name: Dump image_pull_secret into file

roles/eda/tasks/idle_deployment.yml

@@ -29,37 +29,6 @@
         replicas: 0
   when: not ui_disabled
 
-- name: Check for an external Redis cache
-  ansible.builtin.import_role:
-    name: redis
-    tasks_from: check_external_config
-  when: redis_type | length == 0 or redis_type == 'unmanaged'
-
-- name: Check for the default Redis configuration
-  ansible.builtin.import_role:
-    name: redis
-    tasks_from: check_default_config
-  when: redis_type | length == 0 or redis_type == 'managed'
-
-- name: Create a default Redis configuration
-  ansible.builtin.import_role:
-    name: redis
-    tasks_from: create_default_config
-  when: redis_type | length == 0
-
-- name: Scale down Redis Deployment
-  kubernetes.core.k8s:
-    state: present
-    definition:
-      apiVersion: apps/v1
-      kind: Deployment
-      metadata:
-        name: "{{ ansible_operator_meta.name }}-redis"
-        namespace: "{{ ansible_operator_meta.namespace }}"
-      spec:
-        replicas: 0
-  when: redis_type == "managed"
-
 - name: Combine postgres default and custom vars for each component
   ansible.builtin.import_role:
     name: postgres

roles/eda/tasks/main.yml

@@ -12,10 +12,6 @@
   include_tasks: idle_deployment.yml
   when: idle_deployment | bool
 
-- name: Setup Redis
-  include_role:
-    name: redis
-
 - name: Check for old postgres configuration
   kubernetes.core.k8s_info:
     kind: Secret

roles/eda/templates/eda-activation-worker.deployment.yaml.j2

@@ -182,38 +182,6 @@ spec:
             secretKeyRef:
               name: '{{ db_fields_encryption_secret_name }}'
               key: secret_key
-        - name: EDA_MQ_HOST
-          valueFrom:
-            secretKeyRef:
-              name: '{{ redis_config_secret }}'
-              key: host
-        - name: EDA_MQ_PORT
-          valueFrom:
-            secretKeyRef:
-              name: '{{ redis_config_secret }}'
-              key: port
-        - name: EDA_MQ_USER
-          valueFrom:
-            secretKeyRef:
-              name: '{{ redis_config_secret }}'
-              key: username
-        - name: EDA_MQ_USER_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: '{{ redis_config_secret }}'
-              key: password
-        - name: EDA_MQ_TLS
-          valueFrom:
-            secretKeyRef:
-              name: '{{ redis_config_secret }}'
-              key: redis_tls
-              optional: true
-        - name: EDA_MQ_REDIS_HA_CLUSTER_HOSTS
-          valueFrom:
-            secretKeyRef:
-              name: '{{ redis_config_secret }}'
-              key: cluster_endpoint
-              optional: true
 {% if combined_activation_worker.resource_requirements is defined %}
         resources: {{ combined_activation_worker.resource_requirements }}
 {% endif %}