Revert notifications controller changes done for promotions

This commit is contained in:
Noam Gal 2024-05-15 11:59:39 +03:00 committed by GitHub
parent ea155a8987
commit aee4c58124
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 6 additions and 20 deletions

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-1-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 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:

View file

@ -611,11 +611,6 @@ 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 |

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 (merge .Values.notifications.context .Values.codefresh.promotions.notifications.context) }} {{- with .Values.notifications.context }}
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
{{- with (merge .Values.notifications.notifiers .Values.codefresh.promotions.notifications.notifiers) }} {{- with .Values.notifications.notifiers }}
{{- toYaml . | nindent 2 }} {{- toYaml . | nindent 2 }}
{{- end }} {{- end }}
{{- with (concat .Values.notifications.subscriptions .Values.codefresh.promotions.notifications.subscriptions) }} {{- with .Values.notifications.subscriptions }}
subscriptions: | subscriptions: |
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
{{- with (merge .Values.notifications.templates .Values.codefresh.promotions.notifications.templates) }} {{- with .Values.notifications.templates }}
{{- toYaml . | nindent 2 }} {{- toYaml . | nindent 2 }}
{{- end }} {{- end }}
{{- with (merge .Values.notifications.triggers .Values.codefresh.promotions.notifications.triggers) }} {{- with .Values.notifications.triggers }}
{{- toYaml . | nindent 2 }} {{- toYaml . | nindent 2 }}
{{- end }} {{- end }}
{{- end }} {{- end }}

View file

@ -3821,12 +3821,3 @@ 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: {}