Skip to content

Commit fcf1d79

Browse files
danielm-codefreshdanielm-codefresh
authored
Merge pull request #186 from codefresh-io/release-0.5.2
Release 0.5.2
2 parents 0492239 + 5248667 commit fcf1d79

File tree

3 files changed

+76
-19
lines changed

3 files changed

+76
-19
lines changed

Diff for: ‎charts/gitops-runtime/Chart.yaml

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v2
2-
appVersion: 0.1.43
2+
appVersion: 0.1.44
33
description: A Helm chart for Codefresh gitops runtime
44
name: gitops-runtime
5-
version: 0.5.1
5+
version: 0.5.2
66
home: https://github.com/codefresh-io/gitops-runtime-helm
77
icon: https://avatars1.githubusercontent.com/u/11412079?v=3
88
keywords:
@@ -15,13 +15,9 @@ annotations:
1515
artifacthub.io/alternativeName: "codefresh-gitops-runtime"
1616
artifacthub.io/changes: |
1717
- kind: changed
18-
description: "update app-proxy image to 1.2696.0"
18+
description: "update codefresh-gitops-operator chart to 1.0.9 to handle promotions"
1919
- kind: changed
20-
description: "jsonPath to application versions uses format with $ sign for root element"
21-
- kind: fixed
22-
description: "fix default version config"
23-
- kind: fixed
24-
description: "support better concurrency in argocd session manager"
20+
description: "update cap-app-proxy to 1.2727.0 (exopse gitLog endpoint)"
2521
dependencies:
2622
- name: argo-cd
2723
repository: https://codefresh-io.github.io/argo-helm
@@ -47,6 +43,6 @@ dependencies:
4743
condition: tunnel-client.enabled
4844
- name: codefresh-gitops-operator
4945
repository: oci://quay.io/codefresh/charts
50-
version: 1.0.4
46+
version: 1.0.9
5147
alias: gitops-operator
5248
condition: gitops-operator.enabled

Diff for: ‎charts/gitops-runtime/README.md

+14-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## Codefresh gitops runtime
2-
![Version: 0.5.1](https://img.shields.io/badge/Version-0.5.1-informational?style=flat-square) ![AppVersion: 0.1.43](https://img.shields.io/badge/AppVersion-0.1.43-informational?style=flat-square)
2+
![Version: 0.5.2](https://img.shields.io/badge/Version-0.5.2-informational?style=flat-square) ![AppVersion: 0.1.44](https://img.shields.io/badge/AppVersion-0.1.44-informational?style=flat-square)
33

44
## Prerequisites
55

@@ -27,7 +27,7 @@ We have created a helper utility to resolve this issue:
2727
The utility is packaged in a container image. Below are instructions on executing the utility using Docker:
2828

2929
```
30-
docker run -v <output_dir>:/output quay.io/codefresh/gitops-runtime-private-registry-utils:0.5.1 <local_registry>
30+
docker run -v <output_dir>:/output quay.io/codefresh/gitops-runtime-private-registry-utils:0.5.2 <local_registry>
3131
```
3232
`output_dir` - is a local directory where the utility will output files. <br>
3333
`local_registry` - is your local registry where you want to mirror the images to
@@ -100,14 +100,14 @@ sealed-secrets:
100100
| app-proxy.image-enrichment.serviceAccount.name | string | `"codefresh-image-enrichment-sa"` | Name of the service account to create or the name of the existing one to use |
101101
| app-proxy.image.pullPolicy | string | `"IfNotPresent"` | |
102102
| app-proxy.image.repository | string | `"quay.io/codefresh/cap-app-proxy"` | |
103-
| app-proxy.image.tag | string | `"1.2696.0"` | |
103+
| app-proxy.image.tag | string | `"1.2727.0"` | |
104104
| app-proxy.imagePullSecrets | list | `[]` | |
105105
| app-proxy.initContainer.command[0] | string | `"./init.sh"` | |
106106
| app-proxy.initContainer.env | object | `{}` | |
107107
| app-proxy.initContainer.extraVolumeMounts | list | `[]` | Extra volume mounts for init container |
108108
| app-proxy.initContainer.image.pullPolicy | string | `"IfNotPresent"` | |
109109
| app-proxy.initContainer.image.repository | string | `"quay.io/codefresh/cap-app-proxy-init"` | |
110-
| app-proxy.initContainer.image.tag | string | `"1.2696.0"` | |
110+
| app-proxy.initContainer.image.tag | string | `"1.2727.0"` | |
111111
| app-proxy.initContainer.resources.limits.cpu | string | `"1"` | |
112112
| app-proxy.initContainer.resources.limits.memory | string | `"512Mi"` | |
113113
| app-proxy.initContainer.resources.requests.cpu | string | `"0.2"` | |
@@ -153,7 +153,16 @@ sealed-secrets:
153153
| argo-cd.eventReporter.replicas | int | `3` | Amount of shards to handle applications events |
154154
| argo-cd.eventReporter.version | string | `"v2"` | Switches between old and new reporter version. Possible values: v1, v2. For v2 `argo-cd.eventReporter.enabled=true` is required |
155155
| argo-cd.fullnameOverride | string | `"argo-cd"` | |
156-
| argo-cd.notifications | object | `{}` | |
156+
| argo-cd.notifications.bots.slack | object | `{}` | |
157+
| argo-cd.notifications.enabled | bool | `true` | |
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"` | |
157166
| argo-events.crds.install | bool | `false` | |
158167
| argo-events.fullnameOverride | string | `"argo-events"` | |
159168
| argo-rollouts.controller.replicas | int | `1` | |

Diff for: ‎charts/gitops-runtime/values.yaml

+57-5
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ global:
4444
# ...
4545
# -----END CERTIFICATE-----
4646

47-
4847
# -- Runtime level settings
4948
runtime:
5049
# -- Runtime name. Must be unique per platform account.
@@ -104,6 +103,7 @@ global:
104103
cpu: 200m
105104
memory: 1Gi
106105
ephemeral-storage: 2Gi
106+
107107
# -------------------------------------------------------------------------------------------------------------------------
108108
# Installer
109109
# -------------------------------------------------------------------------------------------------------------------------
@@ -115,6 +115,7 @@ installer:
115115
repository: quay.io/codefresh/gitops-runtime-installer
116116
tag: ""
117117
pullPolicy: IfNotPresent
118+
118119
# -----------------------------------------------------------------------------------------------------------------------
119120
# Sealed secrets
120121
# -----------------------------------------------------------------------------------------------------------------------
@@ -162,7 +163,59 @@ argo-cd:
162163
enabled: true
163164
# -- Extract application version based on ApplicationConfiguration CRD
164165
useApplicationConfiguration: true
165-
notifications: {}
166+
notifications:
167+
enabled: true
168+
169+
bots:
170+
slack: {}
171+
172+
notifiers:
173+
service.webhook.cf-promotion-app-revision-changed-notifier: |
174+
url: http://gitops-operator:8082/app-revision-changed
175+
headers:
176+
- name: Content-Type
177+
value: application/json
178+
179+
subscriptions:
180+
- triggers:
181+
- cf-promotion-on-deployed-trigger
182+
recipients:
183+
- cf-promotion-app-revision-changed-notifier
184+
- triggers:
185+
- cf-promotion-on-out-of-sync-trigger
186+
recipients:
187+
- cf-promotion-app-revision-changed-notifier
188+
189+
templates:
190+
template.cf-promotion-app-revision-changed-template: |
191+
webhook:
192+
cf-promotion-app-revision-changed-notifier:
193+
method: POST
194+
body: |
195+
{
196+
"APP_NAMESPACE": {{ .app.metadata.namespace | quote }},
197+
"APP_NAME": {{ .app.metadata.name | quote }},
198+
"REPO_URL": {{ call .repo.RepoURLToHTTPS .app.spec.source.repoURL | quote }},
199+
"BRANCH": {{ .app.spec.source.targetRevision | quote }},
200+
"PATH": {{ .app.spec.source.path | quote }},
201+
"PREV_COMMIT_SHA": {{ (index .app.status.history (sub (len .app.status.history) 2)).revision | quote }},
202+
"CURRENT_COMMIT_SHA": {{ .app.status.operationState.syncResult.revision | quote }}
203+
}
204+
205+
triggers:
206+
trigger.cf-promotion-on-deployed-trigger: |
207+
- description: Application is synced and healthy. Triggered once per commit.
208+
when: get(app.spec.syncPolicy, "automated") != nil && app.status.sync.status == "Synced" && app.status.health.status == "Healthy" && app.status.operationState.syncResult.revision != nil
209+
oncePer: app.status.operationState.syncResult.revision
210+
send:
211+
- cf-promotion-app-revision-changed-template
212+
trigger.cf-promotion-on-out-of-sync-trigger: |
213+
- description: Application is out of sync (when autoHeal is off). Triggered once per commit.
214+
when: get(app.spec.syncPolicy, "automated") == nil && app.status.sync.status == "OutOfSync" && app.status.operationState.syncResult.revision != nil
215+
oncePer: app.status.operationState.syncResult.revision
216+
send:
217+
- cf-promotion-app-revision-changed-template
218+
166219
167220
#-----------------------------------------------------------------------------------------------------------------------
168221
# Argo Events
@@ -430,15 +483,15 @@ app-proxy:
430483
tag: 1.1.10-main
431484
image:
432485
repository: quay.io/codefresh/cap-app-proxy
433-
tag: 1.2696.0
486+
tag: 1.2727.0
434487
pullPolicy: IfNotPresent
435488
# -- Extra volume mounts for main container
436489
extraVolumeMounts: []
437490

438491
initContainer:
439492
image:
440493
repository: quay.io/codefresh/cap-app-proxy-init
441-
tag: 1.2696.0
494+
tag: 1.2727.0
442495
pullPolicy: IfNotPresent
443496
command:
444497
- ./init.sh
@@ -534,7 +587,6 @@ app-proxy:
534587
affinity: {}
535588
# -- extra volumes
536589
extraVolumes: []
537-
########################################################################################################################
538590

539591
#-----------------------------------------------------------------------------------------------------------------------
540592
# gitops-operator

0 commit comments

Comments
 (0)