DevFW-CICD/argocd-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #73 from codefresh-io/CR-23481-cf-notifications-values

Browse source 
add .Values.codefresh.promotions.notifications overrides to argocd-notifications-cm
This commit is contained in:
Noam Gal 2024-05-13 09:18:05 +03:00 committed by GitHub
commit ea155a8987
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -4,3 +4,6 @@ output
.idea .idea
**/*.tgz **/*.tgz
**/charts/*/charts **/charts/*/charts
# only ignore the values.yaml file at the root of the repo
/values.yaml

2
charts/argo-cd/Chart.yaml
View file

@ -3,7 +3,7 @@ appVersion: v2.10-2024.3.29-1dcc54e29
kubeVersion: ">=1.23.0-0" kubeVersion: ">=1.23.0-0"
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd name: argo-cd
version: 6.7.18-cap-2.10-2024.3.29-1dcc54e29 version: 6.7.18-1-cap-2.10-2024.3.29-1dcc54e29
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
sources: sources:

5
charts/argo-cd/README.md
View file

@ -611,6 +611,11 @@ NAME: my-release
| apiVersionOverrides | object | `{}` | | | apiVersionOverrides | object | `{}` | |
| applicationVersioning.enabled | bool | `true` | enables the Codefresh application versioning feature | | applicationVersioning.enabled | bool | `true` | enables the Codefresh application versioning feature |
| applicationVersioning.useApplicationConfiguration | bool | `true` | use ApplicationConfiguration CRD to manage application versioning | | 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.additionalLabels | object | `{}` | Addtional labels to be added to all CRDs |
| crds.annotations | object | `{}` | Annotations to be added to all CRDs | | crds.annotations | object | `{}` | Annotations to be added to all CRDs |
| crds.install | bool | `true` | Install and upgrade CRDs | | crds.install | bool | `true` | Install and upgrade CRDs |

10
charts/argo-cd/templates/argocd-configs/argocd-notifications-cm.yaml
View file

@ -9,20 +9,20 @@ metadata:
data: data:
context: | context: |
argocdUrl: {{ .Values.notifications.argocdUrl | default (printf "https://%s" .Values.global.domain) }} argocdUrl: {{ .Values.notifications.argocdUrl | default (printf "https://%s" .Values.global.domain) }}
{{- with .Values.notifications.context }} {{- with (merge .Values.notifications.context .Values.codefresh.promotions.notifications.context) }}
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
{{- with .Values.notifications.notifiers }} {{- with (merge .Values.notifications.notifiers .Values.codefresh.promotions.notifications.notifiers) }}
{{- toYaml . | nindent 2 }} {{- toYaml . | nindent 2 }}
{{- end }} {{- end }}
{{- with .Values.notifications.subscriptions }} {{- with (concat .Values.notifications.subscriptions .Values.codefresh.promotions.notifications.subscriptions) }}
subscriptions: | subscriptions: |
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
{{- with .Values.notifications.templates }} {{- with (merge .Values.notifications.templates .Values.codefresh.promotions.notifications.templates) }}
{{- toYaml . | nindent 2 }} {{- toYaml . | nindent 2 }}
{{- end }} {{- end }}
{{- with .Values.notifications.triggers }} {{- with (merge .Values.notifications.triggers .Values.codefresh.promotions.notifications.triggers) }}
{{- toYaml . | nindent 2 }} {{- toYaml . | nindent 2 }}
{{- end }} {{- end }}
{{- end }} {{- end }}

9
charts/argo-cd/values.yaml
View file

@ -3821,3 +3821,12 @@ eventReporter:
enabled: false enabled: false
# -- List of custom rules for the event reporter's ClusterRole resource # -- List of custom rules for the event reporter's ClusterRole resource
rules: [] rules: []
codefresh:
promotions:
notifications:
context: {}
notifigers: {}
subscriptions: []
templates: {}
triggers: {}