fix: a simple runtime application ends up being out-of-sync

Refactor redis.server configuration in argo-gateway and event-reporter
configmaps to conditionally include the redis server URL only if it exists.
Update tests to check for the absence of redis.server instead of its value.

Author: ATGardner

charts/gitops-runtime/templates/_helpers.tpl

@@ -291,7 +291,7 @@ Determine argocd redis url
 {{- else }}
   {{- printf "" }}
 {{- end }}
-{{- end}}
+{{- end }}
 
 {{/*
 Determine argo worklofws server name

charts/gitops-runtime/templates/argo-gateway/configmap.yaml

@@ -1,7 +1,10 @@
 {{- define "argo-gateway.resources.configmap.defaults" }}
 argocd.server: {{ include "codefresh-gitops-runtime.argocd.server.no-protocol-url" . }}
 repo.server: {{ include "codefresh-gitops-runtime.argocd.reposerver.url" . }}
-redis.server: {{ include "codefresh-gitops-runtime.argocd.redis.url" . }}
+  {{- $redisServer := (include "codefresh-gitops-runtime.argocd.redis.url" .) }}
+  {{- if $redisServer }}
+redis.server: {{ $redisServer }}
+  {{- end }}
 {{- end }}
 
 {{- $defaultConfig := (include "argo-gateway.resources.configmap.defaults" . | fromYaml ) }}

charts/gitops-runtime/templates/event-reporters/cluster-event-reporter/configmap.yaml

@@ -1,7 +1,10 @@
 {{- define "cluster-event-reporter.resources.configmap.defaults" }}
 argocd.server: {{ include "codefresh-gitops-runtime.argocd.server.no-protocol-url" . }}
-redis.server: {{ include "codefresh-gitops-runtime.argocd.redis.url" . }}
 repo.server: {{ include "codefresh-gitops-runtime.argocd.reposerver.url" . }}
+  {{- $redisServer := (include "codefresh-gitops-runtime.argocd.redis.url" .) }}
+  {{- if $redisServer }}
+redis.server: {{ $redisServer }}
+  {{- end }}
 argo-gateway.server: http://argo-gateway
 resource.threadiness: '100'
 app.queue.size: '1000'

charts/gitops-runtime/templates/event-reporters/runtime-event-reporter/configmap.yaml

@@ -1,7 +1,10 @@
 {{- define "runtime-event-reporter.resources.configmap.defaults"}}
 argocd.server: {{ include "codefresh-gitops-runtime.argocd.server.no-protocol-url" . }}
-redis.server: {{ include "codefresh-gitops-runtime.argocd.redis.url" . }}
 repo.server: {{ include "codefresh-gitops-runtime.argocd.reposerver.url" . }}
+  {{- $redisServer := (include "codefresh-gitops-runtime.argocd.redis.url" .) }}
+  {{- if $redisServer }}
+redis.server: {{ $redisServer }}
+  {{- end }}
 argo-gateway.server: http://argo-gateway
 resource.threadiness: '10'
 app.queue.size: '1000'

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

@@ -12,9 +12,8 @@ tests:
       - equal:
           path: data["argocd.server"]
           value: argo-cd-server:80
-      - equal:
+      - notExists:
           path: data["redis.server"]
-          value: null
       - equal:
           path: data["repo.server"]
           value: argo-cd-repo-server:8081

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

@@ -39,9 +39,8 @@ tests:
       - equal:
           path: data["argocd.server"]
           value: argo-cd-server:80
-      - equal:
+      - notExists:
           path: data["redis.server"]
-          value: null
       - equal:
           path: data["repo.server"]
           value: argo-cd-repo-server:8081