fix: argocd svc and port overrides

Author: mikhail-klimko

charts/gitops-runtime/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 0.1.35
 description: A Helm chart for Codefresh gitops runtime
 name: gitops-runtime
-version: 0.2.20
+version: 0.2.21
 home: https://github.com/codefresh-io/gitops-runtime-helm
 icon: https://avatars1.githubusercontent.com/u/11412079?v=3
 keywords:
@@ -14,8 +14,8 @@ maintainers:
 annotations:
   artifacthub.io/alternativeName: "codefresh-gitops-runtime"
   artifacthub.io/changes: |
-    - kind: changed
-      description: Update ArgoCD to v2.8.1-cap-CR-not-setup-kustomize-ns
+    - kind: fixed
+      description: Fix argoCDServerServiceName and argoCDServerServicePort overrides
 dependencies:
 - name: argo-cd
   repository: https://codefresh-io.github.io/argo-helm

charts/gitops-runtime/templates/event-reporters/events-reporter/eventsource.yaml

@@ -2,6 +2,14 @@
 {{- $_ := set $eventReporterContext "Values" (get .Values "event-reporters") }}
 {{- $_ := set $eventReporterContext.Values "global" (get .Values "global") }}
 # should allow overwriting in values.yaml
-{{- $_ := set $eventReporterContext.Values.events "argoCDServerServiceName" ( include "codefresh-gitops-runtime.argocd.server.servicename" . ) }}
-{{- $_ := set $eventReporterContext.Values.events "argoCDServerServicePort" ( include "codefresh-gitops-runtime.argocd.server.serviceport" . ) }}
+{{- $argoCDServerServiceName := (include "codefresh-gitops-runtime.argocd.server.servicename" .) -}}
+{{- $argoCDServerServicePort := ( include "codefresh-gitops-runtime.argocd.server.serviceport" . ) -}}
+{{- if $eventReporterContext.Values.events.argoCDServerServiceName -}}
+  {{ $argoCDServerServiceName = $eventReporterContext.Values.events.argoCDServerServiceName }}
+{{- end -}}
+{{- if $eventReporterContext.Values.events.argoCDServerServicePort -}}
+  {{ $argoCDServerServicePort = $eventReporterContext.Values.events.argoCDServerServicePort }}
+{{- end -}}
+{{- $_ := set $eventReporterContext.Values.events "argoCDServerServiceName" $argoCDServerServiceName }}
+{{- $_ := set $eventReporterContext.Values.events "argoCDServerServicePort" $argoCDServerServicePort }}
 {{- include "event-reporters.events-reporter.eventsource" $eventReporterContext }}