feat: external argocd unders .values.global.integrations

Author: mikhail-klimko

charts/gitops-runtime/templates/_helpers.tpl

@@ -93,48 +93,28 @@ Determine argocd redis service name. Must be called with chart root context
 Determine argocd repo server service name. Must be called with chart root context
 */}}
 {{- define "codefresh-gitops-runtime.argocd.reposerver.servicename" -}}
-{{/* For now use template from ArgoCD chart until better approach */}}
-  {{- if (index .Subcharts "argo-cd") }}
-    {{- template "argo-cd.repoServer.fullname" (dict "Values" (get .Values "argo-cd") "Release" .Release ) }}
-  {{- else }}
-    {{- $repoServer := index .Values "global" "external-argo-cd" "repoServer" }}
-    {{- $svc := required "ArgoCD is not enabled and .Values.global.external-argo-cd.repoServer.svc is not set" $repoServer.svc }}
-    {{- printf "%s" $svc }}
-  {{- end }}
+  {{- $repoServer := index .Values "global" "integrations" "argo-cd" "repoServer" }}
+  {{- $svc := required ".Values.global.integrations.argo-cd.repoServer.svc is not set" $repoServer.svc }}
+  {{- printf "%s" $svc }}
 {{- end }}
 
 {{/*
 Determine argocd argocd repo server port
 */}}
 {{- define "codefresh-gitops-runtime.argocd.reposerver.serviceport" -}}
-{{/* For now use template from ArgoCD chart until better approach */}}
-  {{- if (index .Subcharts "argo-cd") }}
-    {{- index .Values "argo-cd" "repoServer" "service" "port" }}
-  {{- else }}
-    {{- $repoServer := index .Values "global" "external-argo-cd" "repoServer" }}
-    {{- $port := required "ArgoCD is not enabled and .Values.global.external-argo-cd.repoServer.svc is not set" $repoServer.port }}
-    {{- printf "%v" $port }}
-  {{- end }}
+  {{- $repoServer := index .Values "global" "integrations" "argo-cd" "repoServer" }}
+  {{- $port := required ".Values.global.integrations.argo-cd.repoServer.svc is not set" $repoServer.port }}
+  {{- printf "%v" $port }}
 {{- end }}
 
 
 {{/*
 Determine argocd repoServer url
 */}}
 {{- define "codefresh-gitops-runtime.argocd.reposerver.url" -}}
-{{- $argoCDValues := (get .Values "argo-cd") }}
-{{- if (index .Values "argo-cd" "enabled") }}
-  {{- $serviceName := include "codefresh-gitops-runtime.argocd.reposerver.servicename" . }}
-  {{- $port := include "codefresh-gitops-runtime.argocd.reposerver.serviceport" . }}
-  {{- printf "%s:%s" $serviceName $port }}
-{{- else if (index .Values "global" "external-argo-cd" "repoServer") }}
-  {{- $repoServer := (index .Values "global" "external-argo-cd" "repoServer") }}
-  {{- $svc := required "ArgoCD is not enabled and .Values.global.external-argo-cd.repoServer.svc is not set" $repoServer.svc }}
-  {{- $port := required "ArgoCD is not enabled and .Values.global.external-argo-cd.repoServer.port is not set" $repoServer.port }}
-  {{- printf "%s:%v" $svc $port }}
-{{- else }}
-  {{- fail "ArgoCD is not enabled and .Values.global.external-argo-cd.repoServer is not set" }}
-{{- end }}
+  {{- $repoServer := (index .Values "global" "integrations" "argo-cd" "repoServer") }}
+  {{- $svc := required ".Values.global.integrations.argo-cd.repoServer.svc is not set" $repoServer.svc }}
+  {{- $port := required ".Values.global.integrations.argo-cd.repoServer.port is not set" $repoServer.port }}
 {{- end}}
 
 
@@ -190,49 +170,27 @@ Determine argocd redis service port. Must be called with chart root context
 Determine argocd server url. Must be called with chart root context
 */}}
 {{- define "codefresh-gitops-runtime.argocd.server.url" -}}
-  {{- if (index .Values "argo-cd" "enabled") }}
-    {{- $protocol := "https" }}
-    {{- $port := include "codefresh-gitops-runtime.argocd.server.serviceport" . }}
-    {{- if (eq $port "80") }}
-      {{- $protocol = "http" }}
-    {{- end }}
-    {{- $url := include "codefresh-gitops-runtime.argocd.server.no-protocol-url" . }}
-    {{- printf "%s://%s" $protocol $url }}
-  {{- else if (index .Values "global" "external-argo-cd" "server") }}
-    {{- $argoCDSrv := (index .Values "global" "external-argo-cd" "server") }}
-    {{- $protocol := "http" }}
-    {{- $svc := required "ArgoCD is not enabled and .Values.global.external-argo-cd.server.svc is not set" $argoCDSrv.svc }}
-    {{- $port := (required "ArgoCD is not enabled and .Values.global.external-argo-cd.server.port is not port" $argoCDSrv.port) | toString }}
-    {{- $rootpath := (index .Values "global" "external-argo-cd" "server" "rootpath") }}
-    {{- if (eq $port "80") }}
-      {{- printf "%s://%s%s" $protocol $svc $rootpath }}
-    {{- else }}
-      {{- printf "%s://%s:%s%s" $protocol $svc $port $rootpath }}
-    {{- end }}
+  {{- $argoCDSrv := (index .Values "global" "integrations" "argo-cd" "server") }}
+  {{- $protocol := "http" }}
+  {{- $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) | toString }}
+  {{- $rootpath := (index .Values "global" "integrations" "argo-cd" "server" "rootpath") }}
+  {{- if (eq $port "80") }}
+    {{- printf "%s://%s%s" $protocol $svc $rootpath }}
   {{- else }}
-    {{- fail "ArgoCD is not enabled and .Values.global.external-argo-cd.server is not set" }}
+    {{- printf "%s://%s:%s%s" $protocol $svc $port $rootpath }}
   {{- end }}
 {{- end}}
 
 {{/*
 Determine argocd server url witout the protocol. Must be called with chart root context
 */}}
 {{- define "codefresh-gitops-runtime.argocd.server.no-protocol-url" -}}
-{{- $argoCDValues := (get .Values "argo-cd") }}
-{{- if (index .Values "argo-cd" "enabled") }}
-  {{- $serverName := include "codefresh-gitops-runtime.argocd.server.servicename" . }}
-  {{- $port := include "codefresh-gitops-runtime.argocd.server.serviceport" . }}
-  {{- $path := (get $argoCDValues.configs.params "server.rootpath") }}
-  {{- printf "%s:%s%s" $serverName $port $path }}
-{{- else if (index .Values "global" "external-argo-cd" "server") }}
-  {{- $argoCDSrv := (index .Values "global" "external-argo-cd" "server") }}
-  {{- $svc := required "ArgoCD is not enabled and .Values.global.external-argo-cd.server.svc is not set" $argoCDSrv.svc }}
-  {{- $port := required "ArgoCD is not enabled and .Values.global.external-argo-cd.server.port is not set" $argoCDSrv.port }}
-  {{- $rootpath := (index .Values "global" "external-argo-cd" "server" "rootpath") }}
+  {{- $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 }}
+  {{- $rootpath := (index .Values "global" "integrations" "argo-cd" "server" "rootpath") }}
   {{- printf "%s:%v%s" $svc $port $rootpath }}
-{{- else }}
-  {{- fail "ArgoCD is not enabled and .Values.global.external-argo-cd.server is not set" }}
-{{- end }}
 {{- end}}
 
 {{- define "codefresh-gitops-runtime.argocd-auth" -}}

charts/gitops-runtime/tests/external_argocd_test.yaml

@@ -681,11 +681,12 @@ tests:
       - ./values/external-argocd-values.yaml
     set:
       global:
-        external-argo-cd:
-          repoServer: null
+        integrations:
+          argo-cd:
+            repoServer: null
     asserts:
       - failedTemplate:
-          errorMessage: "ArgoCD is not enabled and .Values.global.external-argo-cd.repoServer is not set"
+          errorMessage: ".Values.global.integrations.argo-cd.repoServer is not set"
 
   - it: should required only allowed auth type for external ArgoCd
     values:
@@ -709,9 +710,10 @@ tests:
       - ./values/external-argocd-values.yaml
     set:
       global:
-        external-argo-cd:
-          server:
-            rootpath: /argocd
+        integrations:
+          argo-cd:
+            server:
+              rootpath: /argocd
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
@@ -726,9 +728,10 @@ tests:
       - ./values/external-argocd-values.yaml
     set:
       global:
-        external-argo-cd:
-          server:
-            rootpath: /argocd
+        integrations:
+          argo-cd:
+            server:
+              rootpath: /argocd
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
@@ -743,9 +746,10 @@ tests:
     template: app-proxy/config.yaml
     set:
       global:
-        external-argo-cd:
-          server:
-            rootpath: /argocd
+        integrations:
+          argo-cd:
+            server:
+              rootpath: /argocd
     asserts:
       - equal:
           path: data.argoCdUrl
@@ -758,9 +762,10 @@ tests:
       - ./values/external-argocd-values.yaml
     set:
       global:
-        external-argo-cd:
-          server:
-            rootpath: /argocd
+        integrations:
+          argo-cd:
+            server:
+              rootpath: /argocd
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
@@ -850,8 +855,9 @@ tests:
       - ./values/external-argocd-values.yaml
     set:
       global:
-        external-argo-cd:
-          server: null
+        integrations:
+          argo-cd:
+            server: null
     asserts:
       - failedTemplate:
-          errorMessage: "ArgoCD is not enabled and .Values.global.external-argo-cd.server is not set"
+          errorMessage: "ArgoCD is not enabled and .Values.global.integrations.argo-cd.server is not set"

charts/gitops-runtime/tests/values/external-argocd-values.yaml

@@ -1,18 +1,13 @@
 global:
-  external-argo-cd:
-    server:
-      protocol: http
-      svc: my-argocd-server
-      port: 80
-      image:
-        repository: quay.io/argoproj/argocd
-        tag: v2.14.2
-    redis:
-      svc: my-argocd-redis
-      port: 6379
-    repoServer:
-      svc: my-argocd-repo-server
-      port: 8081
+  integrations:
+    argo-cd:
+      server:
+        protocol: http
+        svc: my-argocd-server
+        port: 80
+      repoServer:
+        svc: my-argocd-repo-server
+        port: 8081
 
 argo-cd:
   enabled: false

charts/gitops-runtime/values.yaml

@@ -103,6 +103,20 @@ global:
           # tokenSecretKeyRef:
           #   name: argocd-token
           #   key: token
+        # -- Service name of the ArgoCD server
+        svc: argo-cd-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: argo-cd-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: