refactor cf-argocd-extras

Author: mikhail-klimko

charts/gitops-runtime/templates/argo-api-gateway/_env.yaml

@@ -2,6 +2,26 @@
 HTTP_PROXY: {{ .Values.global.httpProxy | squote}}
 HTTPS_PROXY: {{ .Values.global.httpsProxy | squote }}
 NO_PROXY: {{ .Values.global.noProxy | squote }}
+
+{{- if and (eq (index .Values "global" "external-argo-cd" "auth" "type") "token") }}
+  {{- if not (index .Values "global" "external-argo-cd" "auth" "token") }}
+ARGO_CD_TOKEN_SECRET_NAME: {{ required ".Values.global.external-argo-cd.auth.type is set to 'token' therefore Values.global.external-argo-cd.auth.tokenSecretKeyRef.name is required" (index .Values "global" "external-argo-cd" "auth" "tokenSecretKeyRef" "name") }}
+ARGO_CD_TOKEN_SECRET_KEY: {{ required ".Values.global.external-argo-cd.auth.type is set to 'token' therefore Values.global.external-argo-cd.auth.tokenSecretKeyRef.key is required" (index .Values "global" "external-argo-cd" "auth" "tokenSecretKeyRef" "key" ) }}
+  {{- else }}
+ARGO_CD_TOKEN_SECRET_NAME: "gitops-runtime-argo-cd-token"
+ARGO_CD_TOKEN_SECRET_KEY: "token"
+  {{- end }}
+{{- end }}
+
+{{- if and (index .Values "global" "external-argo-cd" "server" "rootpath") }}
+ARGOCD_SERVER_ROOTPATH: {{ index .Values "global" "external-argo-cd" "server" "rootpath" }}
+{{- end }}
+
+{{- if or .Values.global.codefresh.tls.caCerts.secret.create (and .Values.global.codefresh.tls.caCerts.secretKeyRef.key .Values.global.codefresh.tls.caCerts.secretKeyRef.name) }}
+  {{- $secretKey := .Values.global.codefresh.tls.caCerts.secret.create | ternary (default "ca-bundle.crt" .Values.global.codefresh.tls.caCerts.secret.key) .Values.global.codefresh.tls.caCerts.secretKeyRef.key }}
+CODEFRESH_SSL_CERT_PATH: {{ printf "/app/config/codefresh-tls-certs/%s" $secretKey }}
+{{- end }}
+
 {{- end }}
 
 {{- define "argo-api-gateway.resources.environment-variables.defaults" -}}

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

@@ -1,6 +1,6 @@
 {{- define "argo-api-gateway.resources.configmap.defaults"}}
-argocd.server: argo-cd-server:80
-repo.server: argo-cd-repo-server:8081
+argocd.server: {{ include "codefresh-gitops-runtime.argocd.server.no-protocol-url" . }}
+repo.server: {{ include "codefresh-gitops-runtime.argocd.reposerver.url" . }}
 {{- end }}
 
 {{- $defaultConfig := (include "argo-api-gateway.resources.configmap.defaults" . | fromYaml ) }}