Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CR-23481-revert-cf-notifications-values #75

Merged
merged 3 commits into from
May 15, 2024
Merged

CR-23481-revert-cf-notifications-values #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
597f232
Revert "Merge pull request #73 from codefresh-io/CR-23481-cf-notifica…
ATGardner May 15, 2024
994a870
added root values.yaml to gitignore
ATGardner May 15, 2024
3bfc790
updated chart version to `6.7.18-2-cap-2.10-2024.3.29-1dcc54e29`
ATGardner May 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/argo-cd/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-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:
Expand Down
5 changes: 0 additions & 5 deletions charts/argo-cd/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
10 changes: 5 additions & 5 deletions charts/argo-cd/templates/argocd-configs/argocd-notifications-cm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
9 changes: 0 additions & 9 deletions charts/argo-cd/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}
Loading