infra/mastodon-chart-mirror
3
0
Fork 0
mirror of https://github.com/mastodon/chart synced 2025-05-18 13:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into s3-upload

Browse Source
This commit is contained in:
Tim Campbell 2024-09-30 16:23:18 +02:00 committed by GitHub
commit ec8cbb6b0f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/deployment-sidekiq.yaml
View File

@ -203,6 +203,8 @@ spec:
value: {{ coalesce $context.Values.mastodon.sidekiq.otel.endpointUri $context.Values.mastodon.otel.endpointUri }} value: {{ coalesce $context.Values.mastodon.sidekiq.otel.endpointUri $context.Values.mastodon.otel.endpointUri }}
- name: OTEL_SERVICE_NAME_PREFIX - name: OTEL_SERVICE_NAME_PREFIX
value: {{ coalesce $context.Values.mastodon.sidekiq.otel.namePrefix $context.Values.mastodon.otel.namePrefix }} 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 }} {{- end }}
volumeMounts: volumeMounts:
{{- if (not $context.Values.mastodon.s3.enabled) }} {{- if (not $context.Values.mastodon.s3.enabled) }}

2
templates/deployment-web.yaml
View File

@ -193,6 +193,8 @@ spec:
value: {{ coalesce .Values.mastodon.web.otel.endpointUri .Values.mastodon.otel.endpointUri }} value: {{ coalesce .Values.mastodon.web.otel.endpointUri .Values.mastodon.otel.endpointUri }}
- name: OTEL_SERVICE_NAME_PREFIX - name: OTEL_SERVICE_NAME_PREFIX
value: {{ coalesce .Values.mastodon.web.otel.namePrefix .Values.mastodon.otel.namePrefix }} 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 }} {{- end }}
volumeMounts: volumeMounts:
{{- if (not .Values.mastodon.s3.enabled) }} {{- if (not .Values.mastodon.s3.enabled) }}

3
values.yaml
View File

@ -195,6 +195,7 @@ mastodon:
enabled: enabled:
exporterUri: exporterUri:
namePrefix: namePrefix:
nameSeparator:
workers: workers:
- name: all-queues - name: all-queues
@ -394,6 +395,7 @@ mastodon:
enabled: enabled:
exporterUri: exporterUri:
namePrefix: namePrefix:
nameSeparator:
# HTTP cache buster configuration. # HTTP cache buster configuration.
# See the documentation for more information about this feature: # See the documentation for more information about this feature:
@ -423,6 +425,7 @@ mastodon:
enabled: false enabled: false
exporterUri: exporterUri:
namePrefix: mastodon namePrefix: mastodon
nameSeparator: "-"
# Sets the PREPARED_STATEMENTS environment variable: https://docs.joinmastodon.org/admin/config/#prepared_statements # Sets the PREPARED_STATEMENTS environment variable: https://docs.joinmastodon.org/admin/config/#prepared_statements
preparedStatements: true preparedStatements: true