initial test fixes

Author: scme0

charts/gitops-runtime/templates/gitops-operator.yaml

@@ -10,22 +10,10 @@
       {{- $_ := set $argoCDImageDict "tag" (get .Subcharts "argo-cd").Chart.AppVersion }}
     {{- end }}
 
-    {{/* Set ArgoCD image */}}
-    {{- if not (index .Values "gitops-operator" "argoCdNotifications" "imageOverride") }}
-      {{- $_ := set $gitopsOperatorContext.Values.argoCdNotifications.image "repository" $argoCDImageDict.repository }}
-      {{- $_ := set $gitopsOperatorContext.Values.argoCdNotifications.image "tag" $argoCDImageDict.tag }}
-    {{- end }}
-
   {{- else if and (index .Values "global" "external-argo-cd" "server" "image") }}
 
     {{ $argoCDImageDict := (index .Values "global" "external-argo-cd" "server" "image") }}
 
-    {{/* Set ArgoCD image */}}
-    {{- if not (index .Values "gitops-operator" "argoCdNotifications" "imageOverride") }}
-      {{- $_ := set $gitopsOperatorContext.Values.argoCdNotifications.image "repository" (required "ArgoCD is not enabled and .Values.global.external-argo-cd.server.image is not set" $argoCDImageDict.repository) }}
-      {{- $_ := set $gitopsOperatorContext.Values.argoCdNotifications.image "tag" (required "ArgoCD is not enabled and .Values.global.external-argo-cd.server.tag is not set" $argoCDImageDict.tag) }}
-    {{- end }}
-
   {{- else }}
       {{- fail "ArgoCD is not enabled and .Values.global.external-argo-cd.server.image is not set"  }}
   {{- end }}
@@ -45,10 +33,6 @@
     {{- end }}
   {{- end }}
 
-  {{/* Set repo server service and port */}}
-  {{- $_ := set $gitopsOperatorContext.Values.argoCdNotifications.argocd.repoServer "fullname" (include "codefresh-gitops-runtime.argocd.reposerver.servicename" . ) }}
-  {{- $_ := set $gitopsOperatorContext.Values.argoCdNotifications.argocd.repoServer "port" (include "codefresh-gitops-runtime.argocd.reposerver.serviceport" . ) }}
-
   {{/* Set argo-cd-server service and port */}}
   {{ if not (index .Values "gitops-operator").env.ARGO_CD_URL }}
     {{- $_ := set $gitopsOperatorContext.Values.env "ARGO_CD_URL" (include "codefresh-gitops-runtime.argocd.server.no-protocol-url" . ) }}