mirror of https://github.com/Siphonay/mastodon
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
GitHub
parent
55a6b54f8e
commit
9c273c2a59
|
|
@ -46,7 +46,6 @@
|
|||
# ignore Helm lockfile, dependency charts, and local values file
|
||||
/chart/Chart.lock
|
||||
/chart/charts/*.tgz
|
||||
/chart/values.yaml
|
||||
|
||||
# Ignore Apple files
|
||||
.DS_Store
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ type: application
|
|||
# This is the chart version. This version number should be incremented each time you make changes
|
||||
# to the chart and its templates, including the app version.
|
||||
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
||||
version: 0.1.2
|
||||
version: 1.0.0
|
||||
|
||||
# This is the version number of the application being deployed. This version number should be
|
||||
# incremented each time you make changes to the application. Versions are not expected to
|
||||
|
|
|
|||
|
|
@ -3,12 +3,9 @@
|
|||
This is a [Helm](https://helm.sh/) chart for installing Mastodon into a
|
||||
Kubernetes cluster. The basic usage is:
|
||||
|
||||
```
|
||||
cp values.yaml.template values.yaml
|
||||
edit values.yaml # configure required settings
|
||||
helm dep update
|
||||
helm upgrade --install my-mastodon ./
|
||||
```
|
||||
1. edit `values.yaml` or create a separate yaml file for custom values
|
||||
1. `helm dep update`
|
||||
1. `helm install --namespace mastodon --create-namespace my-mastodon ./ -f path/to/additional/values.yaml`
|
||||
|
||||
This chart has been tested on Helm 3.0.1 and above.
|
||||
|
||||
|
|
@ -16,14 +13,11 @@ This chart has been tested on Helm 3.0.1 and above.
|
|||
|
||||
The variables that _must_ be configured are:
|
||||
|
||||
- `ingress.hostname`; even if you aren’t using an Ingress, this value is used to
|
||||
set `LOCAL_DOMAIN`.
|
||||
|
||||
- password and keys in the `secrets`, `postgresql`, and `redis` groups; if
|
||||
- password and keys in the `mastodon.secrets`, `postgresql`, and `redis` groups; if
|
||||
left blank, some of those values will be autogenerated, but will not persist
|
||||
across upgrades.
|
||||
|
||||
- SMTP settings for your mailer in the `smtp` group.
|
||||
- SMTP settings for your mailer in the `mastodon.smtp` group.
|
||||
|
||||
# Missing features
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
{{- if .Values.ingress.enabled }}
|
||||
{{- range $host := .Values.ingress.hosts }}
|
||||
{{- range .paths }}
|
||||
http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }}
|
||||
http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- else if contains "NodePort" .Values.service.type }}
|
||||
|
|
@ -16,6 +16,7 @@
|
|||
echo http://$SERVICE_IP:{{ .Values.service.port }}
|
||||
{{- else if contains "ClusterIP" .Values.service.type }}
|
||||
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "mastodon.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
|
||||
export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
|
||||
echo "Visit http://127.0.0.1:8080 to use your application"
|
||||
kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80
|
||||
kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
|
||||
{{- end }}
|
||||
|
|
|
|||
|
|
@ -11,59 +11,59 @@ data:
|
|||
DB_HOST: {{ .Values.postgresql.postgresqlHostname }}
|
||||
{{- end }}
|
||||
DB_NAME: {{ .Values.postgresql.postgresqlDatabase }}
|
||||
DB_POOL: {{ .Values.application.sidekiq.concurrency | quote }}
|
||||
DB_POOL: {{ .Values.mastodon.sidekiq.concurrency | quote }}
|
||||
DB_PORT: "5432"
|
||||
DB_USER: {{ .Values.postgresql.postgresqlUsername }}
|
||||
DEFAULT_LOCALE: {{ .Values.locale }}
|
||||
DEFAULT_LOCALE: {{ .Values.mastodon.locale }}
|
||||
{{- if .Values.elasticsearch.enabled }}
|
||||
ES_ENABLED: "true"
|
||||
ES_HOST: {{ template "mastodon.elasticsearch.fullname" . }}-master
|
||||
ES_PORT: "9200"
|
||||
{{- end }}
|
||||
LOCAL_DOMAIN: {{ .Values.ingress.hostname }}
|
||||
LOCAL_DOMAIN: {{ .Values.mastodon.local_domain }}
|
||||
# https://devcenter.heroku.com/articles/tuning-glibc-memory-behavior
|
||||
MALLOC_ARENA_MAX: "2"
|
||||
NODE_ENV: "production"
|
||||
RAILS_ENV: "production"
|
||||
REDIS_HOST: {{ template "mastodon.redis.fullname" . }}-master
|
||||
REDIS_PORT: "6379"
|
||||
{{- if .Values.smtp.auth_method }}
|
||||
SMTP_AUTH_METHOD: {{ .Values.smtp.auth_method }}
|
||||
{{- if .Values.mastodon.smtp.auth_method }}
|
||||
SMTP_AUTH_METHOD: {{ .Values.mastodon.smtp.auth_method }}
|
||||
{{- end }}
|
||||
{{- if .Values.smtp.ca_file }}
|
||||
SMTP_CA_FILE: {{ .Values.smtp.ca_file }}
|
||||
{{- if .Values.mastodon.smtp.ca_file }}
|
||||
SMTP_CA_FILE: {{ .Values.mastodon.smtp.ca_file }}
|
||||
{{- end }}
|
||||
{{- if .Values.smtp.delivery_method }}
|
||||
SMTP_DELIVERY_METHOD: {{ .Values.smtp.delivery_method }}
|
||||
{{- if .Values.mastodon.smtp.delivery_method }}
|
||||
SMTP_DELIVERY_METHOD: {{ .Values.mastodon.smtp.delivery_method }}
|
||||
{{- end }}
|
||||
{{- if .Values.smtp.domain }}
|
||||
SMTP_DOMAIN: {{ .Values.smtp.domain }}
|
||||
{{- if .Values.mastodon.smtp.domain }}
|
||||
SMTP_DOMAIN: {{ .Values.mastodon.smtp.domain }}
|
||||
{{- end }}
|
||||
{{- if .Values.smtp.enable_starttls_auto }}
|
||||
SMTP_ENABLE_STARTTLS_AUTO: {{ .Values.smtp.enable_starttls_auto | quote }}
|
||||
{{- if .Values.mastodon.smtp.enable_starttls_auto }}
|
||||
SMTP_ENABLE_STARTTLS_AUTO: {{ .Values.mastodon.smtp.enable_starttls_auto | quote }}
|
||||
{{- end }}
|
||||
{{- if .Values.smtp.from_address }}
|
||||
SMTP_FROM_ADDRESS: {{ .Values.smtp.from_address }}
|
||||
{{- if .Values.mastodon.smtp.from_address }}
|
||||
SMTP_FROM_ADDRESS: {{ .Values.mastodon.smtp.from_address }}
|
||||
{{- end }}
|
||||
{{- if .Values.smtp.login }}
|
||||
SMTP_LOGIN: {{ .Values.smtp.login }}
|
||||
{{- if .Values.mastodon.smtp.login }}
|
||||
SMTP_LOGIN: {{ .Values.mastodon.smtp.login }}
|
||||
{{- end }}
|
||||
{{- if .Values.smtp.openssl_verify_mode }}
|
||||
SMTP_OPENSSL_VERIFY_MODE: {{ .Values.smtp.openssl_verify_mode }}
|
||||
{{- if .Values.mastodon.smtp.openssl_verify_mode }}
|
||||
SMTP_OPENSSL_VERIFY_MODE: {{ .Values.mastodon.smtp.openssl_verify_mode }}
|
||||
{{- end }}
|
||||
{{- if .Values.smtp.password }}
|
||||
SMTP_PASSWORD: {{ .Values.smtp.password }}
|
||||
{{- if .Values.mastodon.smtp.password }}
|
||||
SMTP_PASSWORD: {{ .Values.mastodon.smtp.password }}
|
||||
{{- end }}
|
||||
{{- if .Values.smtp.port }}
|
||||
SMTP_PORT: {{ .Values.smtp.port | quote }}
|
||||
{{- if .Values.mastodon.smtp.port }}
|
||||
SMTP_PORT: {{ .Values.mastodon.smtp.port | quote }}
|
||||
{{- end }}
|
||||
{{- if .Values.smtp.reply_to }}
|
||||
SMTP_REPLY_TO: {{ .Values.smtp.reply_to }}
|
||||
{{- if .Values.mastodon.smtp.reply_to }}
|
||||
SMTP_REPLY_TO: {{ .Values.mastodon.smtp.reply_to }}
|
||||
{{- end }}
|
||||
{{- if .Values.smtp.server }}
|
||||
SMTP_SERVER: {{ .Values.smtp.server }}
|
||||
{{- if .Values.mastodon.smtp.server }}
|
||||
SMTP_SERVER: {{ .Values.mastodon.smtp.server }}
|
||||
{{- end }}
|
||||
{{- if .Values.smtp.tls }}
|
||||
SMTP_TLS: {{ .Values.smtp.tls | quote }}
|
||||
{{- if .Values.mastodon.smtp.tls }}
|
||||
SMTP_TLS: {{ .Values.mastodon.smtp.tls | quote }}
|
||||
{{- end }}
|
||||
STREAMING_CLUSTER_NUM: {{ .Values.application.streaming.workers | quote }}
|
||||
STREAMING_CLUSTER_NUM: {{ .Values.mastodon.streaming.workers | quote }}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{{ if .Values.cron.removeMedia.enabled }}
|
||||
{{ if .Values.mastodon.cron.removeMedia.enabled }}
|
||||
apiVersion: batch/v1beta1
|
||||
kind: CronJob
|
||||
metadata:
|
||||
|
|
@ -6,7 +6,7 @@ metadata:
|
|||
labels:
|
||||
{{- include "mastodon.labels" . | nindent 4 }}
|
||||
spec:
|
||||
schedule: {{ .Values.cron.removeMedia.schedule }}
|
||||
schedule: {{ .Values.mastodon.cron.removeMedia.schedule }}
|
||||
jobTemplate:
|
||||
spec:
|
||||
template:
|
||||
|
|
@ -16,7 +16,7 @@ spec:
|
|||
restartPolicy: OnFailure
|
||||
# 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:
|
||||
|
|
@ -64,7 +64,7 @@ spec:
|
|||
name: {{ .Release.Name }}-redis
|
||||
key: redis-password
|
||||
- name: "PORT"
|
||||
value: {{ .Values.application.web.port | quote }}
|
||||
value: {{ .Values.mastodon.web.port | quote }}
|
||||
volumeMounts:
|
||||
- name: assets
|
||||
mountPath: /opt/mastodon/public/assets
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -55,10 +55,10 @@ spec:
|
|||
name: {{ .Release.Name }}-redis
|
||||
key: redis-password
|
||||
- name: "PORT"
|
||||
value: {{ .Values.application.streaming.port | quote }}
|
||||
value: {{ .Values.mastodon.streaming.port | quote }}
|
||||
ports:
|
||||
- name: streaming
|
||||
containerPort: {{ .Values.application.streaming.port }}
|
||||
containerPort: {{ .Values.mastodon.streaming.port }}
|
||||
protocol: TCP
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ spec:
|
|||
name: {{ .Release.Name }}-redis
|
||||
key: redis-password
|
||||
- name: "PORT"
|
||||
value: {{ .Values.application.web.port | quote }}
|
||||
value: {{ .Values.mastodon.web.port | quote }}
|
||||
volumeMounts:
|
||||
- name: assets
|
||||
mountPath: /opt/mastodon/public/assets
|
||||
|
|
@ -79,7 +79,7 @@ spec:
|
|||
mountPath: /opt/mastodon/public/system
|
||||
ports:
|
||||
- name: http
|
||||
containerPort: {{ .Values.application.web.port }}
|
||||
containerPort: {{ .Values.mastodon.web.port }}
|
||||
protocol: TCP
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{{- if .Values.ingress.enabled -}}
|
||||
{{- $fullName := include "mastodon.fullname" . -}}
|
||||
{{- $svcPort := .Values.service.port -}}
|
||||
{{- $webPort := .Values.mastodon.web.port -}}
|
||||
{{- $streamingPort := .Values.mastodon.streaming.port -}}
|
||||
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
|
||||
apiVersion: networking.k8s.io/v1beta1
|
||||
{{- else -}}
|
||||
|
|
@ -27,15 +28,19 @@ spec:
|
|||
{{- end }}
|
||||
{{- end }}
|
||||
rules:
|
||||
- host: {{ .Values.ingress.hostname | quote }}
|
||||
{{- range .Values.ingress.hosts }}
|
||||
- host: {{ .host | quote }}
|
||||
http:
|
||||
paths:
|
||||
- path: '/'
|
||||
{{- range .paths }}
|
||||
- path: {{ .path }}
|
||||
backend:
|
||||
serviceName: {{ $fullName }}-web
|
||||
servicePort: {{ $svcPort }}
|
||||
- path: '/api/v1/streaming'
|
||||
servicePort: {{ $webPort }}
|
||||
- path: {{ .path }}api/v1/streaming
|
||||
backend:
|
||||
serviceName: {{ $fullName }}-streaming
|
||||
servicePort: {{ .Values.application.streaming.port }}
|
||||
servicePort: {{ $streamingPort }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ spec:
|
|||
restartPolicy: Never
|
||||
# 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:
|
||||
|
|
@ -65,7 +65,7 @@ spec:
|
|||
name: {{ .Release.Name }}-redis
|
||||
key: redis-password
|
||||
- name: "PORT"
|
||||
value: {{ .Values.application.web.port | quote }}
|
||||
value: {{ .Values.mastodon.web.port | quote }}
|
||||
volumeMounts:
|
||||
- name: assets
|
||||
mountPath: /opt/mastodon/public/assets
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ spec:
|
|||
restartPolicy: Never
|
||||
# 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:
|
||||
|
|
@ -66,7 +66,7 @@ spec:
|
|||
name: {{ .Release.Name }}-redis
|
||||
key: redis-password
|
||||
- name: "PORT"
|
||||
value: {{ .Values.application.web.port | quote }}
|
||||
value: {{ .Values.mastodon.web.port | quote }}
|
||||
volumeMounts:
|
||||
- name: assets
|
||||
mountPath: /opt/mastodon/public/assets
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{{- if .Values.createAdmin.enabled }}
|
||||
{{- if .Values.mastodon.createAdmin.enabled }}
|
||||
apiVersion: batch/v1
|
||||
kind: Job
|
||||
metadata:
|
||||
|
|
@ -17,7 +17,7 @@ spec:
|
|||
restartPolicy: Never
|
||||
# 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:
|
||||
|
|
@ -44,9 +44,9 @@ spec:
|
|||
- bin/tootctl
|
||||
- accounts
|
||||
- create
|
||||
- {{ .Values.createAdmin.username }}
|
||||
- {{ .Values.mastodon.createAdmin.username }}
|
||||
- --email
|
||||
- {{ .Values.createAdmin.email }}
|
||||
- {{ .Values.mastodon.createAdmin.email }}
|
||||
- --confirmed
|
||||
- --role
|
||||
- admin
|
||||
|
|
@ -71,7 +71,7 @@ spec:
|
|||
name: {{ .Release.Name }}-redis
|
||||
key: redis-password
|
||||
- name: "PORT"
|
||||
value: {{ .Values.application.web.port | quote }}
|
||||
value: {{ .Values.mastodon.web.port | quote }}
|
||||
volumeMounts:
|
||||
- name: assets
|
||||
mountPath: /opt/mastodon/public/assets
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ spec:
|
|||
restartPolicy: Never
|
||||
# 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:
|
||||
|
|
@ -65,7 +65,7 @@ spec:
|
|||
name: {{ .Release.Name }}-redis
|
||||
key: redis-password
|
||||
- name: "PORT"
|
||||
value: {{ .Values.application.web.port | quote }}
|
||||
value: {{ .Values.mastodon.web.port | quote }}
|
||||
volumeMounts:
|
||||
- name: assets
|
||||
mountPath: /opt/mastodon/public/assets
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ metadata:
|
|||
{{- include "mastodon.labels" . | nindent 4 }}
|
||||
spec:
|
||||
accessModes:
|
||||
- {{ .Values.persistence.system.accessMode }}
|
||||
- {{ .Values.mastodon.persistence.system.accessMode }}
|
||||
resources:
|
||||
{{- toYaml .Values.persistence.assets.resources | nindent 4}}
|
||||
storageClassName: {{ .Values.persistence.assets.storageClassName }}
|
||||
{{- toYaml .Values.mastodon.persistence.assets.resources | nindent 4}}
|
||||
storageClassName: {{ .Values.mastodon.persistence.assets.storageClassName }}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ metadata:
|
|||
{{- include "mastodon.labels" . | nindent 4 }}
|
||||
spec:
|
||||
accessModes:
|
||||
- {{ .Values.persistence.system.accessMode }}
|
||||
- {{ .Values.mastodon.persistence.system.accessMode }}
|
||||
resources:
|
||||
{{- toYaml .Values.persistence.system.resources | nindent 4}}
|
||||
storageClassName: {{ .Values.persistence.system.storageClassName }}
|
||||
{{- toYaml .Values.mastodon.persistence.system.resources | nindent 4}}
|
||||
storageClassName: {{ .Values.mastodon.persistence.system.storageClassName }}
|
||||
|
|
|
|||
|
|
@ -6,25 +6,25 @@ metadata:
|
|||
{{- include "mastodon.labels" . | nindent 4 }}
|
||||
type: Opaque
|
||||
data:
|
||||
{{- if not (empty .Values.secrets.secret_key_base) }}
|
||||
SECRET_KEY_BASE: "{{ .Values.secrets.secret_key_base | b64enc }}"
|
||||
{{- if not (empty .Values.mastodon.secrets.secret_key_base) }}
|
||||
SECRET_KEY_BASE: "{{ .Values.mastodon.secrets.secret_key_base | b64enc }}"
|
||||
{{- else }}
|
||||
SECRET_KEY_BASE: {{ required "secret_key_base is required" .Values.secrets.secret_key_base }}
|
||||
SECRET_KEY_BASE: {{ required "secret_key_base is required" .Values.mastodon.secrets.secret_key_base }}
|
||||
{{- end }}
|
||||
{{- if not (empty .Values.secrets.otp_secret) }}
|
||||
OTP_SECRET: "{{ .Values.secrets.otp_secret | b64enc }}"
|
||||
{{- if not (empty .Values.mastodon.secrets.otp_secret) }}
|
||||
OTP_SECRET: "{{ .Values.mastodon.secrets.otp_secret | b64enc }}"
|
||||
{{- else }}
|
||||
OTP_SECRET: {{ required "otp_secret is required" .Values.secrets.otp_secret }}
|
||||
OTP_SECRET: {{ required "otp_secret is required" .Values.mastodon.secrets.otp_secret }}
|
||||
{{- end }}
|
||||
{{- if not (empty .Values.secrets.vapid.private_key) }}
|
||||
VAPID_PRIVATE_KEY: "{{ .Values.secrets.vapid.private_key | b64enc }}"
|
||||
{{- if not (empty .Values.mastodon.secrets.vapid.private_key) }}
|
||||
VAPID_PRIVATE_KEY: "{{ .Values.mastodon.secrets.vapid.private_key | b64enc }}"
|
||||
{{- else }}
|
||||
VAPID_PRIVATE_KEY: {{ required "vapid.private_key is required" .Values.secrets.vapid.private_key }}
|
||||
VAPID_PRIVATE_KEY: {{ required "vapid.private_key is required" .Values.mastodon.secrets.vapid.private_key }}
|
||||
{{- end }}
|
||||
{{- if not (empty .Values.secrets.vapid.public_key) }}
|
||||
VAPID_PUBLIC_KEY: "{{ .Values.secrets.vapid.public_key | b64enc }}"
|
||||
{{- if not (empty .Values.mastodon.secrets.vapid.public_key) }}
|
||||
VAPID_PUBLIC_KEY: "{{ .Values.mastodon.secrets.vapid.public_key | b64enc }}"
|
||||
{{- else }}
|
||||
VAPID_PUBLIC_KEY: {{ required "vapid.public_key is required" .Values.secrets.vapid.public_key }}
|
||||
VAPID_PUBLIC_KEY: {{ required "vapid.public_key is required" .Values.mastodon.secrets.vapid.public_key }}
|
||||
{{- end }}
|
||||
{{- if not .Values.postgresql.enabled }}
|
||||
postgresql-password: "{{ .Values.postgresql.postgresqlPassword | b64enc }}"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ metadata:
|
|||
spec:
|
||||
type: {{ .Values.service.type }}
|
||||
ports:
|
||||
- port: {{ .Values.application.streaming.port }}
|
||||
- port: {{ .Values.mastodon.streaming.port }}
|
||||
targetPort: streaming
|
||||
protocol: TCP
|
||||
name: streaming
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ metadata:
|
|||
spec:
|
||||
type: {{ .Values.service.type }}
|
||||
ports:
|
||||
- port: {{ .Values.service.port }}
|
||||
- port: {{ .Values.mastodon.web.port }}
|
||||
targetPort: http
|
||||
protocol: TCP
|
||||
name: http
|
||||
|
|
|
|||
|
|
@ -2,61 +2,45 @@ replicaCount: 1
|
|||
|
||||
image:
|
||||
repository: tootsuite/mastodon
|
||||
pullPolicy: Always
|
||||
# https://hub.docker.com/r/tootsuite/mastodon/tags
|
||||
tag: v3.3.0
|
||||
#
|
||||
# alternatively, use `latest` for the latest release or `edge` for the image
|
||||
# built from the most recent commit
|
||||
#
|
||||
# tag: latest
|
||||
tag: v3.3.0
|
||||
# use `Always` when using `latest` tag
|
||||
pullPolicy: IfNotPresent
|
||||
|
||||
ingress:
|
||||
enabled: false
|
||||
annotations:
|
||||
kubernetes.io/ingress.class: nginx
|
||||
kubernetes.io/tls-acme: "true"
|
||||
# cert-manager.io/cluster-issuer: "letsencrypt"
|
||||
#
|
||||
# ensure that NGINX's upload size matches Mastodon's
|
||||
# for the K8s ingress controller:
|
||||
# nginx.ingress.kubernetes.io/proxy-body-size: 40m
|
||||
# for the NGINX ingress controller:
|
||||
# nginx.org/client-max-body-size: 40m
|
||||
# this value is used for LOCAL_DOMAIN
|
||||
hostname: mastodon.local
|
||||
tls:
|
||||
- secretName: mastodon-tls
|
||||
hosts:
|
||||
- mastodon.local
|
||||
|
||||
mastodon:
|
||||
# create an initial administrator user; the password is autogenerated and will
|
||||
# have to be reset
|
||||
createAdmin:
|
||||
enabled: false
|
||||
username: not_gargron
|
||||
email: not@example.com
|
||||
|
||||
# available locales: https://github.com/tootsuite/mastodon/blob/master/config/application.rb#L43
|
||||
locale: en
|
||||
|
||||
cron:
|
||||
# run `tootctl media remove` every week
|
||||
removeMedia:
|
||||
enabled: true
|
||||
schedule: "0 0 * * 0"
|
||||
|
||||
application:
|
||||
web:
|
||||
port: 3000
|
||||
streaming:
|
||||
port: 4000
|
||||
# this should be set manually since os.cpus() returns the number of CPUs on
|
||||
# the node running the pod, which is unrelated to the resources allocated to
|
||||
# the pod by k8s
|
||||
workers: 1
|
||||
sidekiq:
|
||||
concurrency: 25
|
||||
|
||||
# available locales: https://github.com/tootsuite/mastodon/blob/master/config/application.rb#L43
|
||||
locale: en
|
||||
local_domain: mastodon.local
|
||||
persistence:
|
||||
assets:
|
||||
# ReadWriteOnce is more widely supported than ReadWriteMany, but limits
|
||||
# scalability, since it requires the Rails and Sidekiq pods to run on the
|
||||
# same node.
|
||||
accessMode: ReadWriteOnce
|
||||
resources:
|
||||
requests:
|
||||
storage: 10Gi
|
||||
system:
|
||||
accessMode: ReadWriteOnce
|
||||
resources:
|
||||
requests:
|
||||
storage: 100Gi
|
||||
# these must be set manually; autogenerated keys are rotated on each upgrade
|
||||
secrets:
|
||||
secret_key_base: ""
|
||||
|
|
@ -64,7 +48,8 @@ secrets:
|
|||
vapid:
|
||||
private_key: ""
|
||||
public_key: ""
|
||||
|
||||
sidekiq:
|
||||
concurrency: 25
|
||||
smtp:
|
||||
auth_method: plain
|
||||
ca_file:
|
||||
|
|
@ -79,6 +64,35 @@ smtp:
|
|||
reply_to:
|
||||
server: smtp.mailgun.org
|
||||
tls: false
|
||||
streaming:
|
||||
port: 4000
|
||||
# this should be set manually since os.cpus() returns the number of CPUs on
|
||||
# the node running the pod, which is unrelated to the resources allocated to
|
||||
# the pod by k8s
|
||||
workers: 1
|
||||
web:
|
||||
port: 3000
|
||||
|
||||
ingress:
|
||||
enabled: true
|
||||
annotations:
|
||||
kubernetes.io/ingress.class: nginx
|
||||
kubernetes.io/tls-acme: "true"
|
||||
# cert-manager.io/cluster-issuer: "letsencrypt"
|
||||
#
|
||||
# ensure that NGINX's upload size matches Mastodon's
|
||||
# for the K8s ingress controller:
|
||||
# nginx.ingress.kubernetes.io/proxy-body-size: 40m
|
||||
# for the NGINX ingress controller:
|
||||
# nginx.org/client-max-body-size: 40m
|
||||
hosts:
|
||||
- host: mastodon.local
|
||||
paths:
|
||||
- path: '/'
|
||||
tls:
|
||||
- secretName: mastodon-tls
|
||||
hosts:
|
||||
- mastodon.local
|
||||
|
||||
# https://github.com/bitnami/charts/tree/master/bitnami/elasticsearch#parameters
|
||||
elasticsearch:
|
||||
|
|
@ -112,21 +126,6 @@ redis:
|
|||
# rotated on each upgrade:
|
||||
password: ""
|
||||
|
||||
persistence:
|
||||
assets:
|
||||
# ReadWriteOnce is more widely supported than ReadWriteMany, but limits
|
||||
# scalability, since it requires the Rails and Sidekiq pods to run on the
|
||||
# same node.
|
||||
accessMode: ReadWriteOnce
|
||||
resources:
|
||||
requests:
|
||||
storage: 10Gi
|
||||
system:
|
||||
accessMode: ReadWriteOnce
|
||||
resources:
|
||||
requests:
|
||||
storage: 100Gi
|
||||
|
||||
service:
|
||||
type: ClusterIP
|
||||
port: 80
|
||||
Loading…
Reference in New Issue