Skip to content

Commit 54135b3

Browse files
[gitops-operator]fix: ensure releases are created if trigger commit causes sync failure
1 parent baabd74 commit 54135b3

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

charts/gitops-runtime/values.yaml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -189,11 +189,10 @@ global:
189189
scrapeTimeout: 10s
190190
labels: {}
191191
config: {}
192-
193192
anchors:
194193
common-envs:
195-
# -- Telemetry configuration
196194
- &otel-config
195+
# -- Telemetry configuration
197196
# -- Base endpoint URL for all OpenTelemetry signals.
198197
# Ref: https://opentelemetry.io/docs/languages/sdk-configuration/otlp-exporter/
199198
OTEL_EXPORTER_OTLP_ENDPOINT: 'http://localhost:4317'
@@ -227,7 +226,6 @@ anchors:
227226
OTEL_EXPORTER_PROMETHEUS_PORT: '9464'
228227
# -- Emit the stable HTTP and networking OTel conventions if CF_TELEMETRY_OTEL_ALLOW_HTTP_INSTRUMENTATION=true.
229228
OTEL_SEMCONV_STABILITY_OPT_IN: 'http'
230-
231229
# -------------------------------------------------------------------------------------------------------------------------
232230
# Installer
233231
# -------------------------------------------------------------------------------------------------------------------------
@@ -272,26 +270,22 @@ sealed-secrets:
272270
argo-cd:
273271
enabled: true
274272
fullnameOverride: argo-cd
275-
276273
notifications:
277274
enabled: false
278-
279275
redis:
280276
## Redis image
281277
image:
282278
# -- Redis repository
283279
repository: ecr-public.aws.com/docker/library/redis
284280
# -- Redis tag
285281
tag: 8.2.2-alpine
286-
287282
redis-ha:
288283
## Redis-ha image
289284
image:
290285
# -- Redis repository
291286
repository: ecr-public.aws.com/docker/library/redis
292287
# -- Redis tag
293288
tag: 8.2.2-alpine
294-
295289
configs:
296290
cm:
297291
timeout.reconciliation: 20s
@@ -570,7 +564,7 @@ app-proxy:
570564
# -- Cors settings for app-proxy. This is the list of allowed domains for platform (comma separated).
571565
cors: "https://g.codefresh.io"
572566
env:
573-
<<:
567+
!!merge <<:
574568
- *otel-config
575569
# -- Level of logging for app-proxy
576570
CF_TELEMETRY_LOGS_LEVEL: 'info'
@@ -688,9 +682,9 @@ gitops-operator:
688682
# -- defaults
689683
registry: quay.io
690684
repository: codefresh/codefresh-gitops-operator
691-
tag: "293f24f"
685+
tag: "fe813e0"
692686
env:
693-
<<:
687+
!!merge <<:
694688
- *otel-config
695689
GITOPS_OPERATOR_VERSION: 0.11.1
696690
serviceAccount:
@@ -859,11 +853,11 @@ redis:
859853
event-reporters:
860854
cluster-event-reporter:
861855
env:
862-
<<:
856+
!!merge <<:
863857
- *otel-config
864858
runtime-event-reporter:
865859
env:
866-
<<:
860+
!!merge <<:
867861
- *otel-config
868862
# -- Redis-HA subchart replaces custom redis deployment when `redis-ha.enabled=true`
869863
# Ref: https://github.com/DandyDeveloper/charts/blob/master/charts/redis-ha/values.yaml

0 commit comments

Comments
 (0)