From 597f2320bf44b7350ee69bba2622cf9952774531 Mon Sep 17 00:00:00 2001 From: Noam Gal Date: Wed, 15 May 2024 10:11:08 +0300 Subject: [PATCH 1/3] Revert "Merge pull request #73 from codefresh-io/CR-23481-cf-notifications-values" This reverts commit ea155a89875f4a29deee8ebe508adf975703b325, reversing changes made to 03731935c477ac18b4f78acc31ec0b50442c141f. --- .gitignore | 3 --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/README.md | 5 ----- .../argocd-configs/argocd-notifications-cm.yaml | 10 +++++----- charts/argo-cd/values.yaml | 9 --------- 5 files changed, 6 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 0d138b3a8..2786867ca 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,3 @@ output .idea **/*.tgz **/charts/*/charts - -# only ignore the values.yaml file at the root of the repo -/values.yaml diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 7b3e97530..52a757a03 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -3,7 +3,7 @@ appVersion: v2.10-2024.3.29-1dcc54e29 kubeVersion: ">=1.23.0-0" description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 6.7.18-1-cap-2.10-2024.3.29-1dcc54e29 +version: 6.7.18-cap-2.10-2024.3.29-1dcc54e29 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/README.md b/charts/argo-cd/README.md index db6238eda..68866a004 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -611,11 +611,6 @@ NAME: my-release | apiVersionOverrides | object | `{}` | | | applicationVersioning.enabled | bool | `true` | enables the Codefresh application versioning feature | | applicationVersioning.useApplicationConfiguration | bool | `true` | use ApplicationConfiguration CRD to manage application versioning | -| codefresh.promotions.notifications.context | object | `{}` | | -| codefresh.promotions.notifications.notifigers | object | `{}` | | -| codefresh.promotions.notifications.subscriptions | list | `[]` | | -| codefresh.promotions.notifications.templates | object | `{}` | | -| codefresh.promotions.notifications.triggers | object | `{}` | | | 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 | diff --git a/charts/argo-cd/templates/argocd-configs/argocd-notifications-cm.yaml b/charts/argo-cd/templates/argocd-configs/argocd-notifications-cm.yaml index 4496fcd6d..2a18a2fc6 100644 --- a/charts/argo-cd/templates/argocd-configs/argocd-notifications-cm.yaml +++ b/charts/argo-cd/templates/argocd-configs/argocd-notifications-cm.yaml @@ -9,20 +9,20 @@ metadata: data: context: | argocdUrl: {{ .Values.notifications.argocdUrl | default (printf "https://%s" .Values.global.domain) }} - {{- with (merge .Values.notifications.context .Values.codefresh.promotions.notifications.context) }} + {{- with .Values.notifications.context }} {{- toYaml . | nindent 4 }} {{- end }} - {{- with (merge .Values.notifications.notifiers .Values.codefresh.promotions.notifications.notifiers) }} + {{- with .Values.notifications.notifiers }} {{- toYaml . | nindent 2 }} {{- end }} - {{- with (concat .Values.notifications.subscriptions .Values.codefresh.promotions.notifications.subscriptions) }} + {{- with .Values.notifications.subscriptions }} subscriptions: | {{- toYaml . | nindent 4 }} {{- end }} - {{- with (merge .Values.notifications.templates .Values.codefresh.promotions.notifications.templates) }} + {{- with .Values.notifications.templates }} {{- toYaml . | nindent 2 }} {{- end }} - {{- with (merge .Values.notifications.triggers .Values.codefresh.promotions.notifications.triggers) }} + {{- with .Values.notifications.triggers }} {{- toYaml . | nindent 2 }} {{- end }} {{- end }} diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index e675db4eb..205c1e016 100644 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -3821,12 +3821,3 @@ eventReporter: enabled: false # -- List of custom rules for the event reporter's ClusterRole resource rules: [] - -codefresh: - promotions: - notifications: - context: {} - notifigers: {} - subscriptions: [] - templates: {} - triggers: {} From 994a870e6aa2eed71582f82eb296883f9eb11c0d Mon Sep 17 00:00:00 2001 From: Noam Gal Date: Wed, 15 May 2024 10:11:52 +0300 Subject: [PATCH 2/3] added root values.yaml to gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 2786867ca..0d138b3a8 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,6 @@ output .idea **/*.tgz **/charts/*/charts + +# only ignore the values.yaml file at the root of the repo +/values.yaml From 3bfc79069b42ce8eddf3b51c9670dcadbccddd3e Mon Sep 17 00:00:00 2001 From: Noam Gal Date: Wed, 15 May 2024 10:13:16 +0300 Subject: [PATCH 3/3] updated chart version to `6.7.18-2-cap-2.10-2024.3.29-1dcc54e29` --- 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 52a757a03..de5f8ee1d 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -3,7 +3,7 @@ appVersion: v2.10-2024.3.29-1dcc54e29 kubeVersion: ">=1.23.0-0" description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 6.7.18-cap-2.10-2024.3.29-1dcc54e29 +version: 6.7.18-2-cap-2.10-2024.3.29-1dcc54e29 home: https://github.com/argoproj/argo-helm icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png sources: