moved "codefresh-gitops-runtime.argocd-token-auth" into "gitops-operator.resources.environment-variables.calculated"

Author: ATGardner

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

@@ -3,9 +3,8 @@
 {{/* Merge environment variables from calculated, defaults and overwrites */}}
 {{- $defaults := (include "gitops-operator.resources.environment-variables.defaults" . | fromYaml) }}
 {{- $calculated := (include "gitops-operator.resources.environment-variables.calculated" . | fromYaml) }}
-{{- $argoCdAuth := (include "codefresh-gitops-runtime.argocd-token-auth" . | fromYaml) }}
 {{- $overrides := .Values.env }}
-{{- $mergedValues := mergeOverwrite $defaults $calculated $argoCdAuth $overrides }}
+{{- $mergedValues := mergeOverwrite $defaults $calculated $overrides }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:

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

@@ -3,6 +3,7 @@ Some environment variables are determined by values provided in other components
 to keep the separation of components as pseudo library charts, they are defined here to be merged when components are generated.
 */}}
 {{- define "gitops-operator.resources.environment-variables.calculated" }}
+  {{- include "codefresh-gitops-runtime.argocd-token-auth" . }}
   {{/* if custom certificates are provided */}}
   {{- if .Values.global.codefresh.tls.caCerts.secretKeyRef }}
 CF_CA_CERT: {{ printf "/app/config/codefresh-tls/%s" .Values.global.codefresh.tls.caCerts.secretKeyRef.key  }}