Merge pull request #58 from codefresh-io/version-config

Version config

Author: denis-codefresh

charts/argo-cd/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: v2.9-2024.2.8-8ba4b03d4
+appVersion: v2.9-2024.2.15-cc783d89f
 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.8-8ba4b03d4
+version: 5.53.12-3-cap-2.9-2024.2.15-cc783d89f
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 sources:
@@ -27,4 +27,4 @@ annotations:
     url: https://argoproj.github.io/argo-helm/pgp_keys.asc
   artifacthub.io/changes: |
     - kind: changed
-      description: Upgrade Argo CD to v2.9-2024.2.8-8ba4b03d4. With critical vulnerability fixes revert and argo-cd reporter project name bypassing
+      description: Upgrade Argo CD to v2.9-2024.2.15-cc783d89f. Getting application version configuration from the Codefresh API.

charts/argo-cd/README.md

@@ -400,6 +400,8 @@ NAME: my-release
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | apiVersionOverrides.cloudgoogle | string | `""` | String to override apiVersion of GKE resources rendered by this helm chart |
+| applicationVersioning.enabled | bool | `true` | enables the Codefresh application versioning feature |
+| applicationVersioning.useApplicationConfiguration | bool | `true` | use ApplicationConfiguration CRD to manage application versioning |
 | crds.additionalLabels | object | `{}` | Addtional labels to be added to all CRDs |
 | crds.annotations | object | `{}` | Annotations to be added to all CRDs |
 | crds.install | bool | `true` | Install and upgrade CRDs |

charts/argo-cd/templates/argocd-repo-server/deployment.yaml

@@ -93,6 +93,10 @@ spec:
           - name: USER_NAME
             value: argocd
           {{- end }}
+          - name: CODEFRESH_APPVERSION_ENABLED
+            value: {{ .Values.applicationVersioning.enabled | quote }}
+          - name: CODEFRESH_APPVERSION_USE_APPCONFIG
+            value: {{ .Values.applicationVersioning.useApplicationConfiguration | quote }}
           - name: ARGOCD_RECONCILIATION_TIMEOUT
             valueFrom:
               configMapKeyRef:
@@ -249,6 +253,18 @@ spec:
                 key: reposerver.enable.git.submodule
                 name: argocd-cmd-params-cm
                 optional: true
+          - name: CODEFRESH_URL
+            valueFrom:
+              configMapKeyRef:
+                name: codefresh-cm
+                key: base-url
+                optional: true
+          - name: CODEFRESH_TOKEN
+            valueFrom:
+              secretKeyRef:
+                key: token
+                name: codefresh-token
+                optional: true
           {{- if .Values.repoServer.useEphemeralHelmWorkingDir }}
           - name: HELM_CACHE_HOME
             value: /helm-working-dir

charts/argo-cd/values.yaml

@@ -26,6 +26,12 @@ openshift:
   # -- enables using arbitrary uid for argo repo server
   enabled: false
 
+applicationVersioning:
+  # -- enables the Codefresh application versioning feature
+  enabled: true
+  # -- use ApplicationConfiguration CRD to manage application versioning
+  useApplicationConfiguration: true
+
 ## Custom resource configuration
 crds:
   # -- Install and upgrade CRDs