feat: external argocd unders .values.global.integrations

Author: mikhail-klimko

charts/gitops-runtime/templates/_helpers.tpl

@@ -77,24 +77,15 @@ Create the name of the service account to use
 Determine argocd server service name. Must be called with chart root context
 */}}
 {{- define "codefresh-gitops-runtime.argocd.server.servicename" -}}
-{{/* For now use template from ArgoCD chart until better approach */}}
-{{- template "argo-cd.server.fullname" (dict "Values" (get .Values "argo-cd") "Release" .Release ) }}
-{{- end }}
-
-{{/*
-Determine argocd redis service name. Must be called with chart root context
-*/}}
-{{- define "codefresh-gitops-runtime.argocd.redis.servicename" -}}
-{{/* For now use template from ArgoCD chart until better approach */}}
-{{- template "argo-cd.redis.fullname" (dict "Values" (get .Values "argo-cd") "Release" .Release ) }}
+{{- printf "%s-%s" (index .Values "argo-cd" "fullnameOverride") (index .Values "argo-cd" "server" "name") }}
 {{- end }}
 
 {{/*
 Determine argocd repo server service name. Must be called with chart root context
 */}}
 {{- define "codefresh-gitops-runtime.argocd.reposerver.servicename" -}}
   {{- if (index .Subcharts "argo-cd") }}
-    {{- template "argo-cd.repoServer.fullname" (dict "Values" (get .Values "argo-cd") "Release" .Release ) }}
+    {{- printf "%s-%s" (index .Values "argo-cd" "fullnameOverride") (index .Values "argo-cd" "repoServer" "name") }}
   {{- else }}
     {{- $repoServer := index .Values "global" "integrations" "argo-cd" "repoServer" }}
     {{- $svc := required ".Values.global.integrations.argo-cd.repoServer.svc is not set" $repoServer.svc }}
@@ -132,15 +123,6 @@ Determine argocd repoServer url
   {{- end }}
 {{- end}}
 
-
-{{/*
-Determine argocd servicename. Must be called with chart root context
-*/}}
-{{- define "codefresh-gitops-runtime.argocd.appcontroller.serviceAccountName" -}}
-{{/* For now use template from ArgoCD chart until better approach */}}
-{{- template "argo-cd.controllerServiceAccountName" (dict "Values" (get .Values "argo-cd") "Release" .Release ) }}
-{{- end }}
-
 {{/*
 Determine rollouts name
 */}}
@@ -153,7 +135,6 @@ Determine rollouts name
   {{- end }}
 {{- end }}
 
-
 {{/*
 Determine argocd server service port. Must be called with chart root context
 */}}
@@ -219,8 +200,8 @@ Determine argocd server url witout the protocol. Must be called with chart root
     {{- printf "%s:%s%s" $serverName $port $path }}
   {{- else }}
     {{- $argoCDSrv := (index .Values "global" "integrations" "argo-cd" "server") }}
-    {{- $svc := required "ArgoCD is not enabled and .Values.global.integrations.argo-cd.server.svc is not set" $argoCDSrv.svc }}
-    {{- $port := required "ArgoCD is not enabled and .Values.global.integrations.argo-cd.server.port is not set" $argoCDSrv.port }}
+    {{- $svc := required ".Values.global.integrations.argo-cd.server.svc is not set" $argoCDSrv.svc }}
+    {{- $port := required ".Values.global.integrations.argo-cd.server.port is not set" $argoCDSrv.port }}
     {{- $rootpath := (index .Values "global" "integrations" "argo-cd" "server" "rootpath") }}
     {{- printf "%s:%v%s" $svc $port $rootpath }}
   {{- end }}

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

@@ -10,13 +10,13 @@ tests:
     asserts:
       - equal:
           path: data["argocd.server"]
-          value: argo-cd-server:80
+          value: argocd-server:80
       - equal:
           path: data["redis.server"]
           value: runtime-redis:6379
       - equal:
           path: data["repo.server"]
-          value: argo-cd-repo-server:8081
+          value: argocd-repo-server:8081
 
   - it: Argo Api Gateway Deployment should have valid matchLabel selectors
     template: argo-gateway/deployment.yaml

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

@@ -37,13 +37,13 @@ tests:
     asserts:
       - equal:
           path: data["argocd.server"]
-          value: argo-cd-server:80
+          value: argocd-server:80
       - equal:
           path: data["redis.server"]
           value: runtime-redis:6379
       - equal:
           path: data["repo.server"]
-          value: argo-cd-repo-server:8081
+          value: argocd-repo-server:8081
 
   - it: Runtime Reporter ConfigMap should have valid redis-ha url
     template: event-reporters/runtime-event-reporter/configmap.yaml

charts/gitops-runtime/values.yaml

@@ -104,7 +104,7 @@ global:
           #   name: argocd-token
           #   key: token
         # -- Service name of the ArgoCD server
-        svc: argo-cd-server
+        svc: argocd-server
         # -- Port of the ArgoCD server
         port: 80
         # -- Set if Argo CD is running behind reverse proxy under subpath different from /
@@ -113,28 +113,9 @@ global:
         rootpath: ''
       repoServer:
         # -- Service name of the ArgoCD repo server
-        svc: argo-cd-repo-server
+        svc: argocd-repo-server
         # -- Port of the ArgoCD repo server
         port: 8081
-
-  # -- Configuration for external ArgoCD
-  # Should be used when `argo-cd.enabled` is set to false
-  external-argo-cd:
-    # -- ArgoCD server settings
-    server:
-      # -- Service name of the ArgoCD server
-      svc: argocd-server
-      # -- Port of the ArgoCD server
-      port: 80
-      # -- Set if Argo CD is running behind reverse proxy under subpath different from /
-      # e.g.
-      # rootpath: '/argocd'
-      rootpath: ''
-    repoServer:
-      # -- Service name of the ArgoCD repo server
-      svc: argocd-repo-server
-      # -- Port of the ArgoCD repo server
-      port: 8081
   # -- Configuration for external Argo Rollouts
   external-argo-rollouts:
     # -- Rollout reporter settings
@@ -244,7 +225,13 @@ sealed-secrets:
 #-----------------------------------------------------------------------------------------------------------------------
 argo-cd:
   enabled: true
-  fullnameOverride: argo-cd
+  fullnameOverride: argocd
+  server:
+    name: server
+  repoServer:
+    name: repo-server
+    service:
+      port: 8081
   crds:
     install: true
   configs:
@@ -279,6 +266,7 @@ argo-cd:
     params:
       server.insecure: true
       application.namespaces: 'cf-*'
+      server.rootpath: ''
   applicationVersioning:
     # -- Enable application versioning
     enabled: true