Skip to content

Commit 5a8b594

Browse files
fix: distinct codefresh names for everything for all notification resources
1 parent ea4f8ce commit 5a8b594

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

charts/gitops-runtime/README.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -155,14 +155,14 @@ sealed-secrets:
155155
| argo-cd.fullnameOverride | string | `"argo-cd"` | |
156156
| argo-cd.notifications.bots.slack | object | `{}` | |
157157
| argo-cd.notifications.enabled | bool | `true` | |
158-
| argo-cd.notifications.notifiers."service.webhook.app-revision-changed-notifier" | string | `"url: http://gitops-operator:8082/app-revision-changed\nheaders:\n- name: Content-Type\n value: application/json\n"` | |
159-
| argo-cd.notifications.subscriptions[0].recipients[0] | string | `"app-revision-changed-notifier"` | |
160-
| argo-cd.notifications.subscriptions[0].triggers[0] | string | `"on-deployed-trigger"` | |
161-
| argo-cd.notifications.subscriptions[1].recipients[0] | string | `"app-revision-changed-notifier"` | |
162-
| argo-cd.notifications.subscriptions[1].triggers[0] | string | `"on-out-of-sync-trigger"` | |
163-
| argo-cd.notifications.templates."template.app-revision-changed-template" | string | `"webhook:\n app-revision-changed-notifier:\n method: POST\n body: |\n {\n \"APP_NAMESPACE\": {{ .app.metadata.namespace | quote }},\n \"APP_NAME\": {{ .app.metadata.name | quote }},\n \"REPO_URL\": {{ call .repo.RepoURLToHTTPS .app.spec.source.repoURL | quote }},\n \"BRANCH\": {{ .app.spec.source.targetRevision | quote }},\n \"PATH\": {{ .app.spec.source.path | quote }},\n \"PREV_COMMIT_SHA\": {{ (index .app.status.history (sub (len .app.status.history) 2)).revision | quote }},\n \"CURRENT_COMMIT_SHA\": {{ .app.status.operationState.syncResult.revision | quote }}\n }\n"` | |
164-
| argo-cd.notifications.triggers."trigger.on-deployed-trigger" | string | `"- description: Application is synced and healthy. Triggered once per commit.\n when: get(app.spec.syncPolicy, \"automated\") != nil && app.status.sync.status == \"Synced\" && app.status.health.status == \"Healthy\" && app.status.operationState.syncResult.revision != nil\n oncePer: app.status.operationState.syncResult.revision\n send:\n - app-revision-changed-template\n"` | |
165-
| argo-cd.notifications.triggers."trigger.on-out-of-sync-trigger" | string | `"- description: Application is out of sync (when autoHeal is off). Triggered once per commit.\n when: get(app.spec.syncPolicy, \"automated\") == nil && app.status.sync.status == \"OutOfSync\" && app.status.operationState.syncResult.revision != nil\n oncePer: app.status.operationState.syncResult.revision\n send:\n - app-revision-changed-template\n"` | |
158+
| argo-cd.notifications.notifiers."service.webhook.cf-promotion-app-revision-changed-notifier" | string | `"url: http://gitops-operator:8082/app-revision-changed\nheaders:\n- name: Content-Type\n value: application/json\n"` | |
159+
| argo-cd.notifications.subscriptions[0].recipients[0] | string | `"cf-promotion-app-revision-changed-notifier"` | |
160+
| argo-cd.notifications.subscriptions[0].triggers[0] | string | `"cf-promotion-on-deployed-trigger"` | |
161+
| argo-cd.notifications.subscriptions[1].recipients[0] | string | `"cf-promotion-app-revision-changed-notifier"` | |
162+
| argo-cd.notifications.subscriptions[1].triggers[0] | string | `"cf-promotion-on-out-of-sync-trigger"` | |
163+
| argo-cd.notifications.templates."template.cf-promotion-app-revision-changed-template" | string | `"webhook:\n cf-promotion-app-revision-changed-notifier:\n method: POST\n body: |\n {\n \"APP_NAMESPACE\": {{ .app.metadata.namespace | quote }},\n \"APP_NAME\": {{ .app.metadata.name | quote }},\n \"REPO_URL\": {{ call .repo.RepoURLToHTTPS .app.spec.source.repoURL | quote }},\n \"BRANCH\": {{ .app.spec.source.targetRevision | quote }},\n \"PATH\": {{ .app.spec.source.path | quote }},\n \"PREV_COMMIT_SHA\": {{ (index .app.status.history (sub (len .app.status.history) 2)).revision | quote }},\n \"CURRENT_COMMIT_SHA\": {{ .app.status.operationState.syncResult.revision | quote }}\n }\n"` | |
164+
| argo-cd.notifications.triggers."trigger.cf-promotion-on-deployed-trigger" | string | `"- description: Application is synced and healthy. Triggered once per commit.\n when: get(app.spec.syncPolicy, \"automated\") != nil && app.status.sync.status == \"Synced\" && app.status.health.status == \"Healthy\" && app.status.operationState.syncResult.revision != nil\n oncePer: app.status.operationState.syncResult.revision\n send:\n - cf-promotion-app-revision-changed-template\n"` | |
165+
| argo-cd.notifications.triggers."trigger.cf-promotion-on-out-of-sync-trigger" | string | `"- description: Application is out of sync (when autoHeal is off). Triggered once per commit.\n when: get(app.spec.syncPolicy, \"automated\") == nil && app.status.sync.status == \"OutOfSync\" && app.status.operationState.syncResult.revision != nil\n oncePer: app.status.operationState.syncResult.revision\n send:\n - cf-promotion-app-revision-changed-template\n"` | |
166166
| argo-events.crds.install | bool | `false` | |
167167
| argo-events.fullnameOverride | string | `"argo-events"` | |
168168
| argo-rollouts.controller.replicas | int | `1` | |

charts/gitops-runtime/values.yaml

+11-11
Original file line numberDiff line numberDiff line change
@@ -170,26 +170,26 @@ argo-cd:
170170
slack: {}
171171

172172
notifiers:
173-
service.webhook.app-revision-changed-notifier: |
173+
service.webhook.cf-promotion-app-revision-changed-notifier: |
174174
url: http://gitops-operator:8082/app-revision-changed
175175
headers:
176176
- name: Content-Type
177177
value: application/json
178178
179179
subscriptions:
180180
- triggers:
181-
- on-deployed-trigger
181+
- cf-promotion-on-deployed-trigger
182182
recipients:
183-
- app-revision-changed-notifier
183+
- cf-promotion-app-revision-changed-notifier
184184
- triggers:
185-
- on-out-of-sync-trigger
185+
- cf-promotion-on-out-of-sync-trigger
186186
recipients:
187-
- app-revision-changed-notifier
187+
- cf-promotion-app-revision-changed-notifier
188188

189189
templates:
190-
template.app-revision-changed-template: |
190+
template.cf-promotion-app-revision-changed-template: |
191191
webhook:
192-
app-revision-changed-notifier:
192+
cf-promotion-app-revision-changed-notifier:
193193
method: POST
194194
body: |
195195
{
@@ -203,18 +203,18 @@ argo-cd:
203203
}
204204
205205
triggers:
206-
trigger.on-deployed-trigger: |
206+
trigger.cf-promotion-on-deployed-trigger: |
207207
- description: Application is synced and healthy. Triggered once per commit.
208208
when: get(app.spec.syncPolicy, "automated") != nil && app.status.sync.status == "Synced" && app.status.health.status == "Healthy" && app.status.operationState.syncResult.revision != nil
209209
oncePer: app.status.operationState.syncResult.revision
210210
send:
211-
- app-revision-changed-template
212-
trigger.on-out-of-sync-trigger: |
211+
- cf-promotion-app-revision-changed-template
212+
trigger.cf-promotion-on-out-of-sync-trigger: |
213213
- description: Application is out of sync (when autoHeal is off). Triggered once per commit.
214214
when: get(app.spec.syncPolicy, "automated") == nil && app.status.sync.status == "OutOfSync" && app.status.operationState.syncResult.revision != nil
215215
oncePer: app.status.operationState.syncResult.revision
216216
send:
217-
- app-revision-changed-template
217+
- cf-promotion-app-revision-changed-template
218218
219219
220220
#-----------------------------------------------------------------------------------------------------------------------

0 commit comments

Comments
 (0)