feat: add separate redis for cf-argocd-extras and app-proxy

Author: mikhail-klimko

charts/gitops-runtime/README.md

@@ -695,7 +695,7 @@ redis-ha:
 | internal-router.serviceAccount.create | bool | `true` |  |
 | internal-router.serviceAccount.name | string | `""` |  |
 | internal-router.tolerations | list | `[]` |  |
-| redis | object | `{"affinity":{},"enabled":true,"env":{},"envFrom":[],"extraArgs":[],"image":{"registry":"public.ecr.aws","repository":"docker/library/redis","tag":"8.2.1-alpine"},"imagePullSecrets":[],"livenessProbe":{"enabled":true,"failureThreshold":5,"initialDelaySeconds":30,"periodSeconds":15,"successThreshold":1,"timeoutSeconds":15},"metrics":{"enabled":true,"env":{},"envFrom":[],"image":{"registry":"ghcr.io","repository":"oliver006/redis_exporter","tag":"v1.72.1"},"livenessProbe":{"enabled":true,"failureThreshold":5,"initialDelaySeconds":30,"periodSeconds":15,"successThreshold":1,"timeoutSeconds":15},"readinessProbe":{"enabled":true,"failureThreshold":5,"initialDelaySeconds":30,"periodSeconds":15,"successThreshold":1,"timeoutSeconds":15},"resources":{},"serviceMonitor":{"enabled":false}},"nodeSelector":{},"pdb":{"annotations":{},"enabled":false,"labels":{},"maxUnavailable":"","minAvailable":1},"podAnnotations":{},"podLabels":{},"podSecurityContext":{},"readinessProbe":{"enabled":true,"failureThreshold":5,"initialDelaySeconds":30,"periodSeconds":15,"successThreshold":1,"timeoutSeconds":15},"resources":{},"securityContext":{},"service":{"annotations":{},"labels":{},"ports":{"metrics":{"port":9121,"targetPort":9121},"redis":{"port":6379,"targetPort":6379}},"type":"ClusterIP"},"serviceAccount":{"annotations":{},"create":true,"name":""},"tolerations":[],"topologySpreadConstraints":[]}` | Enable standalone redis deployment Will be replaced by redis-ha subchart when `redis-ha.enabled=true` |
+| redis | object | `{"affinity":{},"enabled":true,"env":{},"envFrom":[],"extraArgs":[],"fullnameOverride":"runtime-redis","image":{"registry":"public.ecr.aws","repository":"docker/library/redis","tag":"8.2.1-alpine"},"imagePullSecrets":[],"livenessProbe":{"enabled":true,"failureThreshold":5,"initialDelaySeconds":30,"periodSeconds":15,"successThreshold":1,"timeoutSeconds":15},"metrics":{"enabled":true,"env":{},"envFrom":[],"image":{"registry":"ghcr.io","repository":"oliver006/redis_exporter","tag":"v1.72.1"},"livenessProbe":{"enabled":true,"failureThreshold":5,"initialDelaySeconds":30,"periodSeconds":15,"successThreshold":1,"timeoutSeconds":15},"readinessProbe":{"enabled":true,"failureThreshold":5,"initialDelaySeconds":30,"periodSeconds":15,"successThreshold":1,"timeoutSeconds":15},"resources":{},"serviceMonitor":{"enabled":false}},"nodeSelector":{},"pdb":{"annotations":{},"enabled":false,"labels":{},"maxUnavailable":"","minAvailable":1},"podAnnotations":{},"podLabels":{},"podSecurityContext":{},"readinessProbe":{"enabled":true,"failureThreshold":5,"initialDelaySeconds":30,"periodSeconds":15,"successThreshold":1,"timeoutSeconds":15},"resources":{},"securityContext":{},"service":{"annotations":{},"labels":{},"ports":{"metrics":{"port":9121,"targetPort":9121},"redis":{"port":6379,"targetPort":6379}},"type":"ClusterIP"},"serviceAccount":{"annotations":{},"create":true,"name":""},"tolerations":[],"topologySpreadConstraints":[]}` | Enable standalone redis deployment Will be replaced by redis-ha subchart when `redis-ha.enabled=true` |
 | redis-ha.additionalAffinities | object | `{}` | Additional affinities to add to the Redis server pods. |
 | redis-ha.affinity | string | `""` | Assign custom [affinity] rules to the Redis pods. |
 | redis-ha.auth | bool | `true` | Configures redis-ha with AUTH |
@@ -705,7 +705,7 @@ redis-ha:
 | redis-ha.exporter.enabled | bool | `false` | Enable Prometheus redis-exporter sidecar |
 | redis-ha.exporter.image | string | `"ghcr.io/oliver006/redis_exporter"` | Repository to use for the redis-exporter |
 | redis-ha.exporter.tag | string | `"v1.69.0"` | Tag to use for the redis-exporter |
-| redis-ha.fullnameOverride | string | `"redis-ha"` | Full name of the Redis HA Resources |
+| redis-ha.fullnameOverride | string | `"runtime-redis-ha"` | Full name of the Redis HA Resources |
 | redis-ha.haproxy.additionalAffinities | object | `{}` | Additional affinities to add to the haproxy pods. |
 | redis-ha.haproxy.affinity | string | `""` | Assign custom [affinity] rules to the haproxy pods. |
 | redis-ha.haproxy.containerSecurityContext | object | See [values.yaml] | HAProxy container-level security context |

charts/gitops-runtime/templates/redis/_helpers.tpl

@@ -4,7 +4,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 If release name contains chart name it will be used as a full name.
 */}}
 {{- define "redis.fullname" -}}
-{{- print "redis" }}
+{{- .Values.redis.fullnameOverride | default (print "redis") }}
 {{- end }}
 
 {{/*

charts/gitops-runtime/tests/argo-api-gateway_test.yaml

@@ -13,7 +13,7 @@ tests:
           value: argo-cd-server:80
       - equal:
           path: data["redis.server"]
-          value: redis:6379
+          value: runtime-redis:6379
       - equal:
           path: data["repo.server"]
           value: argo-cd-repo-server:8081
@@ -82,7 +82,7 @@ tests:
     asserts:
       - equal:
           path: data["redis.server"]
-          value: redis-ha-haproxy:6379
+          value: runtime-redis-ha-haproxy:6379
 
   - it: Argo Api Gateway should have CODEFRESH_SSL_CERT_PATH env var when .Values.global.codefresh.tls.caCerts.secret.create is true
     template: argo-gateway/deployment.yaml

charts/gitops-runtime/tests/event-reporters_test.yaml

@@ -30,6 +30,21 @@ tests:
           path: metadata.name
           value: runtime-event-reporter
 
+  - it: Runtime Reporter ConfigMap should have valid data
+    template: event-reporters/runtime-event-reporter/configmap.yaml
+    values:
+      - ./values/mandatory-values-ingress.yaml
+    asserts:
+      - equal:
+          path: data["argocd.server"]
+          value: argo-cd-server:80
+      - equal:
+          path: data["redis.server"]
+          value: runtime-redis:6379
+      - equal:
+          path: data["repo.server"]
+          value: argo-cd-repo-server:8081
+
   - it: Runtime Reporter ConfigMap should have valid redis-ha url
     template: event-reporters/runtime-event-reporter/configmap.yaml
     values:
@@ -40,7 +55,7 @@ tests:
     asserts:
       - equal:
           path: data["redis.server"]
-          value: redis-ha-haproxy:6379
+          value: runtime-redis-ha-haproxy:6379
 
   - it: Runtime Reporter should have CODEFRESH_SSL_CERT_PATH env var when .Values.global.codefresh.tls.caCerts.secret.create is true
     template: event-reporters/runtime-event-reporter/deployment.yaml

charts/gitops-runtime/values.yaml

@@ -714,6 +714,7 @@ redis-secret-init:
 # Will be replaced by redis-ha subchart when `redis-ha.enabled=true`
 redis:
   enabled: true
+  fullnameOverride: "runtime-redis"
   # -- Redis image
   image:
     registry: public.ecr.aws
@@ -809,7 +810,7 @@ redis-ha:
   # -- Enables the Redis HA subchart and disables the custom Redis single node deployment
   enabled: false
   # -- Full name of the Redis HA Resources
-  fullnameOverride: "redis-ha"
+  fullnameOverride: "runtime-redis-ha"
   ## Redis image
   image:
     # -- Redis repository