feat: implement support for customer-managed ArgoCD instances (#399)

Author: mikhail-klimko

charts/gitops-runtime/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 0.1.67
+appVersion: 0.1.69-0
 description: A Helm chart for Codefresh gitops runtime
 name: gitops-runtime
 version: 0.0.0
@@ -16,6 +16,7 @@ annotations:
 dependencies:
 - name: argo-cd
   repository: https://codefresh-io.github.io/argo-helm
+  condition: argo-cd.enabled
   version: 7.7.14-5-cap-2.13.3-2025.3.5-50344f005
 - name: argo-events
   repository: https://codefresh-io.github.io/argo-helm
@@ -38,7 +39,7 @@ dependencies:
   condition: tunnel-client.enabled
 - name: codefresh-gitops-operator
   repository: oci://quay.io/codefresh/charts
-  version: 0.3.27
+  version: 0.5.0
   alias: gitops-operator
   condition: gitops-operator.enabled
 - name: garage
@@ -48,5 +49,4 @@ dependencies:
   condition: garage-workflows-artifact-storage.enabled
 - name: cf-argocd-extras
   repository: oci://quay.io/codefresh/charts
-  version: 0.1.0
-  condition: cf-argocd-extras.enabled
+  version: 0.3.12

charts/gitops-runtime/README.md

@@ -16,6 +16,72 @@ See [Use OCI-based registries](https://helm.sh/docs/topics/registries/)
 ## Codefresh official documentation:
 Prior to running the installation please see the official documentation at: https://codefresh.io/docs/docs/installation/gitops/hybrid-gitops-helm-installation/
 
+## Installation with External ArgoCD
+
+If you want to use an existing ArgoCD installation, you can disable the built-in ArgoCD and configure the GitOps Runtime to use the external ArgoCD.
+See the `values.yaml` example below:
+
+```yaml
+global:
+  # -- 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
+      # -- Port of the ArgoCD server
+      port: 80
+      # -- Image settings for the ArgoCD server
+      image:
+        repository: quay.io/argoproj/argocd
+        tag: "v2.14.4"
+      # -- Set if Argo CD is running behind reverse proxy under subpath different from /
+      # e.g.
+      # rootpath: '/argocd'
+      rootpath: ''
+    redis:
+      # -- Service name of the ArgoCD Redis
+      svc: argocd-redis
+      # -- Port of the ArgoCD Redis
+      port: 6379
+    repoServer:
+      # -- Service name of the ArgoCD repo server
+      svc: argocd-repo-server
+      # -- Port of the ArgoCD repo server
+      port: 8081
+
+    # -- How GitOps Runtime should authenticate with ArgoCD
+    auth:
+      # -- Authentication type. Can be password or token
+      type: password
+
+      # If `auth.type=password` is set
+      # -- ArgoCD username in plain text
+      username: "admin"
+      # -- ArgoCD password in plain text
+      password: ""
+      # -- ArgoCD password referenced by an existing secret
+      passwordSecretKeyRef:
+        name: argocd-initial-admin-secret
+        key: password
+
+      # If `auth.type=token` is set
+      # -- ArgoCD token in plain text
+      token: ""
+      # -- ArgoCD token referenced by an existing secret
+      tokenSecretKeyRef: {}
+      # e.g:
+      # tokenSecretKeyRef:
+      #   name: argocd-token
+      #   key: token
+
+argo-cd:
+  # -- Disable built-in ArgoCD
+  enabled: false
+```
+
+
 ## Using with private registries - Helper utility
 The GitOps Runtime comprises multiple subcharts and container images. Subcharts also vary in values structure, making it difficult to override image specific values to use private registries.
 We have created a helper utility to resolve this issue:

charts/gitops-runtime/README.md.gotmpl

@@ -0,0 +1,2 @@
+GitOps Runtime {{ .Values.global.runtime.name }} has been successfully installed in your cluster! 
+To complete the setup, please finalize the process in the platform here: https://g.codefresh.io/2.0/account-settings/runtimes/{{ .Values.global.runtime.name }}/runtime-components

charts/gitops-runtime/templates/NOTES.txt

@@ -8,7 +8,8 @@ cors: {{ .Values.global.codefresh.url }}
 clusterChunkSize: {{ . | quote }}
   {{- end }}
 env: {{ .Values.config.env | quote}}
-isConfigurationRuntime: {{ .Values.global.runtime.isConfigurationRuntime | quote }} 
+isConfigurationRuntime: {{ .Values.global.runtime.isConfigurationRuntime | quote }}
+isExternalArgoCD: {{ .Values.global.runtime.isExternalArgoCD | quote }}
 runtimeName: {{ required "global.runtime.name is required" .Values.global.runtime.name | quote}}
 skipGitPermissionValidation: {{ .Values.config.skipGitPermissionValidation | quote }}
 logLevel: {{ .Values.config.logLevel | quote }}

charts/gitops-runtime/templates/_components/cap-app-proxy/_config.yaml

@@ -5,17 +5,9 @@ ARGO_CD_URL:
       name: cap-app-proxy-cm
       key: argoCdUrl
       optional: true
-ARGO_CD_USERNAME:
-  valueFrom:
-    configMapKeyRef:
-      name: cap-app-proxy-cm
-      key: argoCdUsername
-      optional: true
-ARGO_CD_PASSWORD:
-  valueFrom:
-    secretKeyRef:
-      name: argocd-initial-admin-secret
-      key: password
+ARGO_CD_TOKEN: {{ include "codefresh-gitops-runtime.argocd.server.token" . | nindent 2 }}
+ARGO_CD_USERNAME: {{ include "codefresh-gitops-runtime.argocd.server.username-env-var" . | nindent 2 }}
+ARGO_CD_PASSWORD: {{ include "codefresh-gitops-runtime.argocd.server.password" . | nindent 2 }}
 ARGO_WORKFLOWS_INSECURE:
   valueFrom:
     configMapKeyRef:
@@ -88,6 +80,12 @@ IS_CONFIGURATION_RUNTIME:
     configMapKeyRef:
       name: codefresh-cm
       key: isConfigurationRuntime
+IS_EXTERNAL_ARGOCD:
+  valueFrom:
+    configMapKeyRef:
+      name: cap-app-proxy-cm
+      key: isExternalArgoCD
+      optional: true
 MANAGED: false
 NAMESPACE:
   valueFrom: