From 26483c27b85266f2b2ed978190a3ca2207dc0116 Mon Sep 17 00:00:00 2001
From: andrii-codefresh <andrii@codefresh.io>
Date: Thu, 15 Feb 2024 14:28:48 +0200
Subject: [PATCH] configuration

---
 charts/argo-cd/Chart.yaml                           |  4 ++--
 .../templates/argocd-repo-server/deployment.yaml    | 13 +++++--------
 charts/argo-cd/values.yaml                          |  5 +++++
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 3202d2f0..bd64e3a3 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: v2.9-2024.2.14-58059e8b0
+appVersion: v2.9-2024.2.15-d04e12c26
 kubeVersion: ">=1.23.0-0"
 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 5.53.12-2-cap-2.9-2024.2.14-58059e8b0
+version: 5.53.12-3-cap-2.9-2024.2.15-d04e12c26
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 sources:
diff --git a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
index f6dea71a..184e05f2 100755
--- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
@@ -89,6 +89,8 @@ spec:
           {{- with (concat .Values.global.env .Values.repoServer.env) }}
             {{- toYaml . | nindent 10 }}
           {{- end }}
+          - name: CODEFRESH_IGNORE_VERSION_CONFIG
+            value: {{ .Values.repoServer.versionConfiguration.disabled | quote }}
           {{- if .Values.openshift.enabled }}
           - name: USER_NAME
             value: argocd
@@ -249,23 +251,18 @@ spec:
                 key: reposerver.enable.git.submodule
                 name: argocd-cmd-params-cm
                 optional: true
-          - name: ARGOCD_REPO_SERVER_CODEFRESH_IGNORE_VERSION_CONFIG
-            valueFrom:
-              configMapKeyRef:
-                name: codefresh-cm
-                key: ignore-version-config
-                optional: true
-          - name: ARGOCD_REPO_SERVER_CODEFRESH_URL
+          - name: CODEFRESH_URL
             valueFrom:
               configMapKeyRef:
                 name: codefresh-cm
                 key: base-url
                 optional: true
-          - name: ARGOCD_REPO_SERVER_CODEFRESH_TOKEN
+          - name: CODEFRESH_TOKEN
             valueFrom:
               secretKeyRef:
                 key: token
                 name: codefresh-token
+                optional: true
           {{- if .Values.repoServer.useEphemeralHelmWorkingDir }}
           - name: HELM_CACHE_HOME
             value: /helm-working-dir
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index afaf1a3e..b8787225 100644
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -2161,6 +2161,11 @@ repoServer:
   # -- Environment variables to pass to repo server
   env: []
 
+  # Applications versions configuration settings
+  versionConfiguration:
+    # Disable getting version configuration from the Codefresh API
+    disabled: false
+
   # -- envFrom to pass to repo server
   # @default -- `[]` (See [values.yaml])
   envFrom: []