Skip to content

Commit a50520b

Browse files
ppapapetrou76ppapapetrou76
authored
Merge branch 'main' into feat/OSS-708-bump-redis-version
2 parents 93b6d5c + d34f662 commit a50520b

File tree

13 files changed

+702
-56
lines changed

13 files changed

+702
-56
lines changed

‎.github/workflows/component-test.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ on:
1515

1616
jobs:
1717
component-test:
18+
if : false # temporarily disable component tests
1819
runs-on: ubuntu-latest
1920

2021
env:

‎charts/gitops-runtime/.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
!charts/
1+
!charts/
2+
3+
.DS_Store

‎charts/gitops-runtime/.helmignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
tests/
22
ci/
33
test-values/
4+
5+
.DS_Store

‎charts/gitops-runtime/Chart.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ dependencies:
2020
version: 8.0.6-10-cap-v3.1.5-2025-09-18-389d4431
2121
- name: argo-events
2222
repository: https://codefresh-io.github.io/argo-helm
23-
version: 2.4.8-cap-CR-29689
23+
version: 2.4.9-cap-CR-30841
2424
- name: argo-workflows
2525
repository: https://codefresh-io.github.io/argo-helm
26-
version: 0.45.15-v3.6.7-cap-CR-28355
26+
version: 0.45.16-v3.6.7-cap-CR-30835
2727
condition: argo-workflows.enabled
2828
- name: argo-rollouts
2929
repository: https://codefresh-io.github.io/argo-helm
30-
version: 2.37.3-6-v1.7.2-cap-CR-29629
30+
version: 2.37.3-7-v1.7.2-cap-OSS-697
3131
condition: argo-rollouts.enabled
3232
- name: sealed-secrets
3333
repository: https://bitnami-labs.github.io/sealed-secrets/

‎charts/gitops-runtime/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -378,13 +378,13 @@ gitops-operator:
378378
| app-proxy.extraVolumeMounts | list | `[]` | Extra volume mounts for main container |
379379
| app-proxy.extraVolumes | list | `[]` | extra volumes |
380380
| app-proxy.fullnameOverride | string | `"cap-app-proxy"` | |
381-
| app-proxy.image-enrichment | object | `{"config":{"clientHeartbeatIntervalInSeconds":5,"concurrencyCmKey":"imageReportExecutor","concurrencyCmName":"workflow-synchronization-semaphores","images":{"gitEnrichment":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-image-enricher-git-info","tag":"1.1.15-main"},"jiraEnrichment":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-image-enricher-jira-info","tag":"1.1.15-main"},"reportImage":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-report-image-info","tag":"1.1.15-main"}},"podGcStrategy":"OnWorkflowCompletion","ttlActiveInSeconds":900,"ttlAfterCompletionInSeconds":86400},"enabled":true,"serviceAccount":{"annotations":null,"create":true,"name":"codefresh-image-enrichment-sa"}}` | Image enrichment process configuration |
382-
| app-proxy.image-enrichment.config | object | `{"clientHeartbeatIntervalInSeconds":5,"concurrencyCmKey":"imageReportExecutor","concurrencyCmName":"workflow-synchronization-semaphores","images":{"gitEnrichment":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-image-enricher-git-info","tag":"1.1.15-main"},"jiraEnrichment":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-image-enricher-jira-info","tag":"1.1.15-main"},"reportImage":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-report-image-info","tag":"1.1.15-main"}},"podGcStrategy":"OnWorkflowCompletion","ttlActiveInSeconds":900,"ttlAfterCompletionInSeconds":86400}` | Configurations for image enrichment workflow |
381+
| app-proxy.image-enrichment | object | `{"config":{"clientHeartbeatIntervalInSeconds":5,"concurrencyCmKey":"imageReportExecutor","concurrencyCmName":"workflow-synchronization-semaphores","images":{"gitEnrichment":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-image-enricher-git-info","tag":"1.1.16-main"},"jiraEnrichment":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-image-enricher-jira-info","tag":"1.1.16-main"},"reportImage":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-report-image-info","tag":"1.1.16-main"}},"podGcStrategy":"OnWorkflowCompletion","ttlActiveInSeconds":900,"ttlAfterCompletionInSeconds":86400},"enabled":true,"serviceAccount":{"annotations":null,"create":true,"name":"codefresh-image-enrichment-sa"}}` | Image enrichment process configuration |
382+
| app-proxy.image-enrichment.config | object | `{"clientHeartbeatIntervalInSeconds":5,"concurrencyCmKey":"imageReportExecutor","concurrencyCmName":"workflow-synchronization-semaphores","images":{"gitEnrichment":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-image-enricher-git-info","tag":"1.1.16-main"},"jiraEnrichment":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-image-enricher-jira-info","tag":"1.1.16-main"},"reportImage":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-report-image-info","tag":"1.1.16-main"}},"podGcStrategy":"OnWorkflowCompletion","ttlActiveInSeconds":900,"ttlAfterCompletionInSeconds":86400}` | Configurations for image enrichment workflow |
383383
| app-proxy.image-enrichment.config.clientHeartbeatIntervalInSeconds | int | `5` | Client heartbeat interval in seconds for image enrichemnt workflow |
384384
| app-proxy.image-enrichment.config.concurrencyCmKey | string | `"imageReportExecutor"` | The name of the key in the configmap to use as synchronization semaphore |
385385
| app-proxy.image-enrichment.config.concurrencyCmName | string | `"workflow-synchronization-semaphores"` | The name of the configmap to use as synchronization semaphore, see https://argoproj.github.io/argo-workflows/synchronization/ |
386-
| app-proxy.image-enrichment.config.images | object | `{"gitEnrichment":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-image-enricher-git-info","tag":"1.1.15-main"},"jiraEnrichment":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-image-enricher-jira-info","tag":"1.1.15-main"},"reportImage":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-report-image-info","tag":"1.1.15-main"}}` | Enrichemnt images |
387-
| app-proxy.image-enrichment.config.images.reportImage | object | `{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-report-image-info","tag":"1.1.15-main"}` | Report image enrichment task image |
386+
| app-proxy.image-enrichment.config.images | object | `{"gitEnrichment":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-image-enricher-git-info","tag":"1.1.16-main"},"jiraEnrichment":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-image-enricher-jira-info","tag":"1.1.16-main"},"reportImage":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-report-image-info","tag":"1.1.16-main"}}` | Enrichemnt images |
387+
| app-proxy.image-enrichment.config.images.reportImage | object | `{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-report-image-info","tag":"1.1.16-main"}` | Report image enrichment task image |
388388
| app-proxy.image-enrichment.config.podGcStrategy | string | `"OnWorkflowCompletion"` | Pod grabage collection strategy. By default all pods will be deleted when the enrichment workflow completes. |
389389
| app-proxy.image-enrichment.config.ttlActiveInSeconds | int | `900` | Maximum allowed runtime for the enrichment workflow |
390390
| app-proxy.image-enrichment.config.ttlAfterCompletionInSeconds | int | `86400` | Number of seconds to live after completion |

‎charts/gitops-runtime/templates/_components/cf-argocd-extras/_default-values.tpl‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ eventReporter:
3333
controller:
3434
enabled: true
3535
type: statefulset
36-
replicas: 3
36+
replicas: 1
3737
revisionHistoryLimit: 5
3838

3939
container:
@@ -62,6 +62,11 @@ eventReporter:
6262
HTTP_PROXY: '{{ .Values.global.httpProxy }}'
6363
HTTPS_PROXY: '{{ .Values.global.httpsProxy }}'
6464
NO_PROXY: '{{ .Values.global.noProxy }}'
65+
APP_QUEUE_SIZE:
66+
valueFrom:
67+
configMapKeyRef:
68+
name: event-reporter-cmd-params-cm
69+
key: app.queue.size
6570
ARGOCD_APPLICATION_NAMESPACES:
6671
valueFrom:
6772
configMapKeyRef:
@@ -99,7 +104,7 @@ eventReporter:
99104
configMapKeyRef:
100105
key: base-url
101106
name: codefresh-cm
102-
EVENT_REPORTER_REPLICAS: 3
107+
EVENT_REPORTER_REPLICAS: 1
103108
INSECURE:
104109
valueFrom:
105110
configMapKeyRef:
@@ -124,36 +129,22 @@ eventReporter:
124129
name: event-reporter-cmd-params-cm
125130
key: log.level
126131
optional: true
127-
METRICS_LISTEN_ADDRESS:
128-
valueFrom:
129-
configMapKeyRef:
130-
name: event-reporter-cmd-params-cm
131-
key: metrics.listen.address
132-
optional: true
133-
RATE_LIMITER_BUCKET_SIZE:
134-
valueFrom:
135-
configMapKeyRef:
136-
name: event-reporter-cmd-params-cm
137-
key: rate.limiter.bucket.size
138-
optional: true
139-
RATE_LIMITER_DURATION:
132+
MAX_APP_RETRIES:
140133
valueFrom:
141134
configMapKeyRef:
142135
name: event-reporter-cmd-params-cm
143-
key: rate.limiter.duration
144-
optional: true
145-
RATE_LIMITER_ENABLED:
136+
key: max.app.retries
137+
METRICS_LISTEN_ADDRESS:
146138
valueFrom:
147139
configMapKeyRef:
148140
name: event-reporter-cmd-params-cm
149-
key: rate.limiter.enabled
141+
key: metrics.listen.address
150142
optional: true
151-
RATE_LIMITER_LEARNING_MODE_ENABLED:
143+
OTEL_EXPORTER_OTLP_TRACES_ENDPOINT:
152144
valueFrom:
153145
configMapKeyRef:
154146
name: event-reporter-cmd-params-cm
155-
key: rate.limiter.learning.mode.enabled
156-
optional: true
147+
key: otlp.address
157148
REDISDB:
158149
valueFrom:
159150
configMapKeyRef:
@@ -221,6 +212,11 @@ eventReporter:
221212
configMapKeyRef:
222213
name: event-reporter-cmd-params-cm
223214
key: sources.server
215+
THREADINESS:
216+
valueFrom:
217+
configMapKeyRef:
218+
name: event-reporter-cmd-params-cm
219+
key: threadiness
224220

225221
volumeMounts:
226222
codefresh-tls-certs:
@@ -258,9 +254,13 @@ eventReporter:
258254
cmd-params-cm:
259255
enabled: true
260256
data:
257+
app.queue.size: '1000'
261258
argocd.server: argo-cd-server:80
259+
max.app.retries: '5'
260+
otlp.address: ''
262261
repo.server: argo-cd-repo-server:8081
263262
sources.server: http://sources-server
263+
threadiness: '100'
264264

265265
volumes:
266266
codefresh-tls-certs:

‎charts/gitops-runtime/templates/_components/gitops-operator/crds/_all.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,6 @@
1717
{{- include "gitops-operator.crds.restricted-gitsource" $context }}
1818
---
1919
{{- include "gitops-operator.crds.promotion-policy" $context }}
20+
---
21+
{{- include "gitops-operator.crds.promotion-task" $context }}
2022
{{- end }}

0 commit comments

Comments
 (0)