Skip to content

Commit 2d2d911

Browse files
event-reporters: added RESOURCE_THREADINESS, new tag 7aefaaf
1 parent 61aff97 commit 2d2d911

File tree

6 files changed

+26
-10
lines changed

6 files changed

+26
-10
lines changed

charts/gitops-runtime/templates/event-reporters/cluster-event-reporter/_env.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,14 +170,19 @@ SHARDING_ALGORITHM:
170170
name: cluster-event-reporter-cmd-params-cm
171171
key: sharding.algorithm
172172
optional: true
173-
SOURCES_SERVER:
173+
ARGO_GATEWAY_URL:
174174
valueFrom:
175175
configMapKeyRef:
176176
name: cluster-event-reporter-cmd-params-cm
177-
key: sources.server
177+
key: argo-gateway.server
178178
THREADINESS:
179179
valueFrom:
180180
configMapKeyRef:
181181
name: cluster-event-reporter-cmd-params-cm
182182
key: threadiness
183+
RESOURCE_THREADINESS:
184+
valueFrom:
185+
configMapKeyRef:
186+
name: cluster-event-reporter-cmd-params-cm
187+
key: resource.threadiness
183188
{{- end -}}

charts/gitops-runtime/templates/event-reporters/cluster-event-reporter/configmap.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
argocd.server: {{ include "codefresh-gitops-runtime.argocd.server.no-protocol-url" . }}
33
redis.server: {{ include "codefresh-gitops-runtime.argocd.redis.url" . }}
44
repo.server: {{ include "codefresh-gitops-runtime.argocd.reposerver.url" . }}
5-
sources.server: http://argo-gateway
5+
argo-gateway.server: http://argo-gateway
6+
resource.threadiness: '100'
67
app.queue.size: '1000'
78
max.app.retries: '5'
89
threadiness: '100'

charts/gitops-runtime/templates/event-reporters/runtime-event-reporter/_env.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,14 +170,19 @@ SHARDING_ALGORITHM:
170170
name: runtime-event-reporter-cmd-params-cm
171171
key: sharding.algorithm
172172
optional: true
173-
SOURCES_SERVER:
173+
ARGO_GATEWAY_URL:
174174
valueFrom:
175175
configMapKeyRef:
176176
name: runtime-event-reporter-cmd-params-cm
177-
key: sources.server
177+
key: argo-gateway.server
178178
THREADINESS:
179179
valueFrom:
180180
configMapKeyRef:
181181
name: runtime-event-reporter-cmd-params-cm
182182
key: threadiness
183+
RESOURCE_THREADINESS:
184+
valueFrom:
185+
configMapKeyRef:
186+
name: runtime-event-reporter-cmd-params-cm
187+
key: resource.threadiness
183188
{{- end -}}

charts/gitops-runtime/templates/event-reporters/runtime-event-reporter/configmap.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
argocd.server: {{ include "codefresh-gitops-runtime.argocd.server.no-protocol-url" . }}
33
redis.server: {{ include "codefresh-gitops-runtime.argocd.redis.url" . }}
44
repo.server: {{ include "codefresh-gitops-runtime.argocd.reposerver.url" . }}
5-
sources.server: http://argo-gateway
5+
argo-gateway.server: http://argo-gateway
6+
resource.threadiness: '10'
67
app.queue.size: '1000'
78
max.app.retries: '5'
89
threadiness: '100'

charts/gitops-runtime/tests/external_argocd_test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ tests:
262262
- ./values/external-argocd-values.yaml
263263
asserts:
264264
- equal:
265-
path: data["sources.server"]
265+
path: data["argo-gateway.server"]
266266
value: http://argo-gateway
267267

268268
- it: runtime-event-reporter ConfigMap should have valid Repo Server URL

charts/gitops-runtime/values.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ global:
201201
image:
202202
registry: quay.io
203203
repository: codefresh/dev/cf-argocd-extras
204-
tag: cr-30629-resource-reporter-workqueu-2-66d7459
204+
tag: cr-30629-resource-reporter-workqueu-2-7aefaaf
205205
nodeSelector: {}
206206
tolerations: []
207207
affinity: {}
@@ -717,7 +717,7 @@ argo-gateway:
717717
image:
718718
registry: quay.io
719719
repository: codefresh/dev/cf-argocd-extras
720-
tag: cr-30629-resource-reporter-workqueu-2-66d7459
720+
tag: cr-30629-resource-reporter-workqueu-2-7aefaaf
721721
nodeSelector: {}
722722
tolerations: []
723723
affinity: {}
@@ -758,4 +758,8 @@ argo-gateway:
758758

759759
event-reporters:
760760
runtime-event-reporter: {}
761-
cluster-event-reporter: {}
761+
cluster-event-reporter:
762+
resources:
763+
requests:
764+
memory: "512Mi"
765+
cpu: "256m"

0 commit comments

Comments
 (0)