From 4878df5f2db35459c1c339db02f95f11af55bc7d Mon Sep 17 00:00:00 2001 From: andrii-codefresh Date: Thu, 15 Feb 2024 13:22:34 +0200 Subject: [PATCH 01/10] version config --- charts/argo-cd/Chart.yaml | 2 +- .../argocd-repo-server/deployment.yaml | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index d24f2830..b7c1910f 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: v2.9-2024.2.8-8ba4b03d4 +appVersion: v2.9-2024.2.14-58059e8b0 kubeVersion: ">=1.23.0-0" description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd diff --git a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml index 2a18df6c..f6dea71a 100755 --- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml +++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml @@ -249,6 +249,23 @@ 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 + valueFrom: + configMapKeyRef: + name: codefresh-cm + key: base-url + optional: true + - name: ARGOCD_REPO_SERVER_CODEFRESH_TOKEN + valueFrom: + secretKeyRef: + key: token + name: codefresh-token {{- if .Values.repoServer.useEphemeralHelmWorkingDir }} - name: HELM_CACHE_HOME value: /helm-working-dir From c6f9897934cebbbe78bd08da7f0bea81e4fa0e57 Mon Sep 17 00:00:00 2001 From: andrii-codefresh Date: Thu, 15 Feb 2024 13:27:51 +0200 Subject: [PATCH 02/10] version --- charts/argo-cd/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index b7c1910f..3202d2f0 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -3,7 +3,7 @@ appVersion: v2.9-2024.2.14-58059e8b0 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-2-cap-2.9-2024.2.14-58059e8b0 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.14-58059e8b0. Getting application version configuration from the Codefresh API From 26483c27b85266f2b2ed978190a3ca2207dc0116 Mon Sep 17 00:00:00 2001 From: andrii-codefresh Date: Thu, 15 Feb 2024 14:28:48 +0200 Subject: [PATCH 03/10] 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: [] From 73a5e68781e0c34cd37bc4c7726ec4c5262f1f9e Mon Sep 17 00:00:00 2001 From: Denys Melnyk Date: Thu, 15 Feb 2024 15:49:40 +0200 Subject: [PATCH 04/10] update enable versioning values --- .../argo-cd/templates/argocd-repo-server/deployment.yaml | 2 +- charts/argo-cd/values.yaml | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml index 184e05f2..bdc80349 100755 --- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml +++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml @@ -90,7 +90,7 @@ spec: {{- toYaml . | nindent 10 }} {{- end }} - name: CODEFRESH_IGNORE_VERSION_CONFIG - value: {{ .Values.repoServer.versionConfiguration.disabled | quote }} + value: {{ not .Values.applicationVersioning.enabled | quote }} {{- if .Values.openshift.enabled }} - name: USER_NAME value: argocd diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index b8787225..2cfca488 100644 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -26,6 +26,10 @@ openshift: # -- enables using arbitrary uid for argo repo server enabled: false +applicationVersioning: + # -- enables the Codefresh application versioning feature + enabled: true + ## Custom resource configuration crds: # -- Install and upgrade CRDs @@ -2161,11 +2165,6 @@ 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: [] From 2eccf93925cddc841e5f8ebf8f84873ccc93aa31 Mon Sep 17 00:00:00 2001 From: Denys Melnyk Date: Thu, 15 Feb 2024 16:04:55 +0200 Subject: [PATCH 05/10] fix trailing space --- charts/argo-cd/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index bd64e3a3..962023e5 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -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.14-58059e8b0. Getting application version configuration from the Codefresh API + description: Upgrade Argo CD to v2.9-2024.2.14-58059e8b0. Getting application version configuration from the Codefresh API From 0b3877eddb60af4fb4d67cbacdfe07a4a44bb0f6 Mon Sep 17 00:00:00 2001 From: Denys Melnyk Date: Thu, 15 Feb 2024 16:29:16 +0200 Subject: [PATCH 06/10] split to 2 values for more granular configuration --- charts/argo-cd/templates/argocd-repo-server/deployment.yaml | 6 ++++-- charts/argo-cd/values.yaml | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml index bdc80349..adf7d6d8 100755 --- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml +++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml @@ -89,12 +89,14 @@ spec: {{- with (concat .Values.global.env .Values.repoServer.env) }} {{- toYaml . | nindent 10 }} {{- end }} - - name: CODEFRESH_IGNORE_VERSION_CONFIG - value: {{ not .Values.applicationVersioning.enabled | quote }} {{- if .Values.openshift.enabled }} - name: USER_NAME value: argocd {{- end }} + - name: CODEFRESH_APPVERSION_ENABLE + value: {{ .Values.applicationVersioning.enabled | quote }} + - name: CODEFRESH_APPVERSION_USE_CONFIG + value: {{ .Values.applicationVersioning.useApplicationConfiguration | quote }} - name: ARGOCD_RECONCILIATION_TIMEOUT valueFrom: configMapKeyRef: diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 2cfca488..3b7a4a25 100644 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -29,6 +29,8 @@ openshift: applicationVersioning: # -- enables the Codefresh application versioning feature enabled: true + # -- use ApplicationConfiguration CRD to manage application versioning + useApplicationConfiguration: true ## Custom resource configuration crds: From d9ee25b424699f4c9e086b7831535012628e4eb3 Mon Sep 17 00:00:00 2001 From: Denys Melnyk Date: Thu, 15 Feb 2024 16:33:36 +0200 Subject: [PATCH 07/10] update docs --- charts/argo-cd/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index e7ed08f9..9c912f1e 100644 --- a/charts/argo-cd/README.md +++ b/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 | From 3486ada426b8ea97c77b2b03f56afdb36244e953 Mon Sep 17 00:00:00 2001 From: Denys Melnyk Date: Thu, 15 Feb 2024 22:41:21 +0200 Subject: [PATCH 08/10] update argocd --- charts/argo-cd/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 962023e5..a9f4217c 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -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.14-58059e8b0. Getting application version configuration from the Codefresh API + description: Upgrade Argo CD to v2.9-2024.2.15-d04e12c26. Getting application version configuration from the Codefresh API. From 55588101cf67feba68e0ae29881d3c96b6a69c8b Mon Sep 17 00:00:00 2001 From: Denys Melnyk Date: Thu, 15 Feb 2024 22:56:25 +0200 Subject: [PATCH 09/10] rename codefresh appversion envs --- charts/argo-cd/templates/argocd-repo-server/deployment.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml index adf7d6d8..12ab438a 100755 --- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml +++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml @@ -93,9 +93,9 @@ spec: - name: USER_NAME value: argocd {{- end }} - - name: CODEFRESH_APPVERSION_ENABLE + - name: CODEFRESH_APPVERSION_ENABLED value: {{ .Values.applicationVersioning.enabled | quote }} - - name: CODEFRESH_APPVERSION_USE_CONFIG + - name: CODEFRESH_APPVERSION_USE_APPCONFIG value: {{ .Values.applicationVersioning.useApplicationConfiguration | quote }} - name: ARGOCD_RECONCILIATION_TIMEOUT valueFrom: From aff3fa6cbde7693656aa479815e7893e58b330b9 Mon Sep 17 00:00:00 2001 From: Denys Melnyk Date: Thu, 15 Feb 2024 22:57:12 +0200 Subject: [PATCH 10/10] update argocd version --- charts/argo-cd/Chart.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index a9f4217c..b9bfafbf 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v2 -appVersion: v2.9-2024.2.15-d04e12c26 +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-3-cap-2.9-2024.2.15-d04e12c26 +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.15-d04e12c26. Getting application version configuration from the Codefresh API. + description: Upgrade Argo CD to v2.9-2024.2.15-cc783d89f. Getting application version configuration from the Codefresh API.