helm: standardize yaml configuration (#15728)

- move application variables under `mastodon` namespace
- restore standard yaml structure for ingress configuration
- move values.yaml.template to values.yaml
This commit is contained in:
Alex Dunn
2021-02-14 23:00:54 -08:00
committed by GitHub
parent 55a6b54f8e
commit 9c273c2a59
20 changed files with 161 additions and 163 deletions

View File

@ -33,7 +33,7 @@ spec:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
# ensure we run on the same node as the other rails components; only
# required when using PVCs that are ReadWriteOnce
{{- if or (eq "ReadWriteOnce" .Values.persistence.assets.accessMode) (eq "ReadWriteOnce" .Values.persistence.system.accessMode) }}
{{- if or (eq "ReadWriteOnce" .Values.mastodon.persistence.assets.accessMode) (eq "ReadWriteOnce" .Values.mastodon.persistence.system.accessMode) }}
affinity:
podAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
@ -63,7 +63,7 @@ spec:
- exec
- sidekiq
- -c
- {{ .Values.application.sidekiq.concurrency | quote }}
- {{ .Values.mastodon.sidekiq.concurrency | quote }}
envFrom:
- configMapRef:
name: {{ include "mastodon.fullname" . }}-env