mirror of
https://github.com/mastodon/chart
synced 2025-05-18 13:03:21 +00:00
Merge branch 'main' into s3-upload
This commit is contained in:
commit
ec8cbb6b0f
|
@ -203,6 +203,8 @@ spec:
|
|||
value: {{ coalesce $context.Values.mastodon.sidekiq.otel.endpointUri $context.Values.mastodon.otel.endpointUri }}
|
||||
- name: OTEL_SERVICE_NAME_PREFIX
|
||||
value: {{ coalesce $context.Values.mastodon.sidekiq.otel.namePrefix $context.Values.mastodon.otel.namePrefix }}
|
||||
- name: OTEL_SERVICE_NAME_SEPARATOR
|
||||
value: {{ coalesce $context.Values.mastodon.sidekiq.otel.nameSeparator $context.Values.mastodon.otel.nameSeparator }}
|
||||
{{- end }}
|
||||
volumeMounts:
|
||||
{{- if (not $context.Values.mastodon.s3.enabled) }}
|
||||
|
|
|
@ -193,6 +193,8 @@ spec:
|
|||
value: {{ coalesce .Values.mastodon.web.otel.endpointUri .Values.mastodon.otel.endpointUri }}
|
||||
- name: OTEL_SERVICE_NAME_PREFIX
|
||||
value: {{ coalesce .Values.mastodon.web.otel.namePrefix .Values.mastodon.otel.namePrefix }}
|
||||
- name: OTEL_SERVICE_NAME_SEPARATOR
|
||||
value: {{ coalesce .Values.mastodon.web.otel.nameSeparator .Values.mastodon.otel.nameSeparator }}
|
||||
{{- end }}
|
||||
volumeMounts:
|
||||
{{- if (not .Values.mastodon.s3.enabled) }}
|
||||
|
|
|
@ -195,6 +195,7 @@ mastodon:
|
|||
enabled:
|
||||
exporterUri:
|
||||
namePrefix:
|
||||
nameSeparator:
|
||||
|
||||
workers:
|
||||
- name: all-queues
|
||||
|
@ -394,6 +395,7 @@ mastodon:
|
|||
enabled:
|
||||
exporterUri:
|
||||
namePrefix:
|
||||
nameSeparator:
|
||||
|
||||
# HTTP cache buster configuration.
|
||||
# See the documentation for more information about this feature:
|
||||
|
@ -423,6 +425,7 @@ mastodon:
|
|||
enabled: false
|
||||
exporterUri:
|
||||
namePrefix: mastodon
|
||||
nameSeparator: "-"
|
||||
|
||||
# Sets the PREPARED_STATEMENTS environment variable: https://docs.joinmastodon.org/admin/config/#prepared_statements
|
||||
preparedStatements: true
|
||||
|
|
Loading…
Reference in New Issue
Block a user