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
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 161 additions and 163 deletions

1
.gitignore vendored
View File

@ -46,7 +46,6 @@
# ignore Helm lockfile, dependency charts, and local values file # ignore Helm lockfile, dependency charts, and local values file
/chart/Chart.lock /chart/Chart.lock
/chart/charts/*.tgz /chart/charts/*.tgz
/chart/values.yaml
# Ignore Apple files # Ignore Apple files
.DS_Store .DS_Store

View File

@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes # 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. # to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/) # 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 # 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 # incremented each time you make changes to the application. Versions are not expected to

View File

@ -3,12 +3,9 @@
This is a [Helm](https://helm.sh/) chart for installing Mastodon into a This is a [Helm](https://helm.sh/) chart for installing Mastodon into a
Kubernetes cluster. The basic usage is: Kubernetes cluster. The basic usage is:
``` 1. edit `values.yaml` or create a separate yaml file for custom values
cp values.yaml.template values.yaml 1. `helm dep update`
edit values.yaml # configure required settings 1. `helm install --namespace mastodon --create-namespace my-mastodon ./ -f path/to/additional/values.yaml`
helm dep update
helm upgrade --install my-mastodon ./
```
This chart has been tested on Helm 3.0.1 and above. 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: The variables that _must_ be configured are:
- `ingress.hostname`; even if you arent using an Ingress, this value is used to - password and keys in the `mastodon.secrets`, `postgresql`, and `redis` groups; if
set `LOCAL_DOMAIN`.
- password and keys in the `secrets`, `postgresql`, and `redis` groups; if
left blank, some of those values will be autogenerated, but will not persist left blank, some of those values will be autogenerated, but will not persist
across upgrades. across upgrades.
- SMTP settings for your mailer in the `smtp` group. - SMTP settings for your mailer in the `mastodon.smtp` group.
# Missing features # Missing features

View File

@ -2,7 +2,7 @@
{{- if .Values.ingress.enabled }} {{- if .Values.ingress.enabled }}
{{- range $host := .Values.ingress.hosts }} {{- range $host := .Values.ingress.hosts }}
{{- range .paths }} {{- range .paths }}
http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }} http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- else if contains "NodePort" .Values.service.type }} {{- else if contains "NodePort" .Values.service.type }}
@ -16,6 +16,7 @@
echo http://$SERVICE_IP:{{ .Values.service.port }} echo http://$SERVICE_IP:{{ .Values.service.port }}
{{- else if contains "ClusterIP" .Values.service.type }} {{- 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 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" 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 }} {{- end }}

View File

@ -11,59 +11,59 @@ data:
DB_HOST: {{ .Values.postgresql.postgresqlHostname }} DB_HOST: {{ .Values.postgresql.postgresqlHostname }}
{{- end }} {{- end }}
DB_NAME: {{ .Values.postgresql.postgresqlDatabase }} DB_NAME: {{ .Values.postgresql.postgresqlDatabase }}
DB_POOL: {{ .Values.application.sidekiq.concurrency | quote }} DB_POOL: {{ .Values.mastodon.sidekiq.concurrency | quote }}
DB_PORT: "5432" DB_PORT: "5432"
DB_USER: {{ .Values.postgresql.postgresqlUsername }} DB_USER: {{ .Values.postgresql.postgresqlUsername }}
DEFAULT_LOCALE: {{ .Values.locale }} DEFAULT_LOCALE: {{ .Values.mastodon.locale }}
{{- if .Values.elasticsearch.enabled }} {{- if .Values.elasticsearch.enabled }}
ES_ENABLED: "true" ES_ENABLED: "true"
ES_HOST: {{ template "mastodon.elasticsearch.fullname" . }}-master ES_HOST: {{ template "mastodon.elasticsearch.fullname" . }}-master
ES_PORT: "9200" ES_PORT: "9200"
{{- end }} {{- end }}
LOCAL_DOMAIN: {{ .Values.ingress.hostname }} LOCAL_DOMAIN: {{ .Values.mastodon.local_domain }}
# https://devcenter.heroku.com/articles/tuning-glibc-memory-behavior # https://devcenter.heroku.com/articles/tuning-glibc-memory-behavior
MALLOC_ARENA_MAX: "2" MALLOC_ARENA_MAX: "2"
NODE_ENV: "production" NODE_ENV: "production"
RAILS_ENV: "production" RAILS_ENV: "production"
REDIS_HOST: {{ template "mastodon.redis.fullname" . }}-master REDIS_HOST: {{ template "mastodon.redis.fullname" . }}-master
REDIS_PORT: "6379" REDIS_PORT: "6379"
{{- if .Values.smtp.auth_method }} {{- if .Values.mastodon.smtp.auth_method }}
SMTP_AUTH_METHOD: {{ .Values.smtp.auth_method }} SMTP_AUTH_METHOD: {{ .Values.mastodon.smtp.auth_method }}
{{- end }} {{- end }}
{{- if .Values.smtp.ca_file }} {{- if .Values.mastodon.smtp.ca_file }}
SMTP_CA_FILE: {{ .Values.smtp.ca_file }} SMTP_CA_FILE: {{ .Values.mastodon.smtp.ca_file }}
{{- end }} {{- end }}
{{- if .Values.smtp.delivery_method }} {{- if .Values.mastodon.smtp.delivery_method }}
SMTP_DELIVERY_METHOD: {{ .Values.smtp.delivery_method }} SMTP_DELIVERY_METHOD: {{ .Values.mastodon.smtp.delivery_method }}
{{- end }} {{- end }}
{{- if .Values.smtp.domain }} {{- if .Values.mastodon.smtp.domain }}
SMTP_DOMAIN: {{ .Values.smtp.domain }} SMTP_DOMAIN: {{ .Values.mastodon.smtp.domain }}
{{- end }} {{- end }}
{{- if .Values.smtp.enable_starttls_auto }} {{- if .Values.mastodon.smtp.enable_starttls_auto }}
SMTP_ENABLE_STARTTLS_AUTO: {{ .Values.smtp.enable_starttls_auto | quote }} SMTP_ENABLE_STARTTLS_AUTO: {{ .Values.mastodon.smtp.enable_starttls_auto | quote }}
{{- end }} {{- end }}
{{- if .Values.smtp.from_address }} {{- if .Values.mastodon.smtp.from_address }}
SMTP_FROM_ADDRESS: {{ .Values.smtp.from_address }} SMTP_FROM_ADDRESS: {{ .Values.mastodon.smtp.from_address }}
{{- end }} {{- end }}
{{- if .Values.smtp.login }} {{- if .Values.mastodon.smtp.login }}
SMTP_LOGIN: {{ .Values.smtp.login }} SMTP_LOGIN: {{ .Values.mastodon.smtp.login }}
{{- end }} {{- end }}
{{- if .Values.smtp.openssl_verify_mode }} {{- if .Values.mastodon.smtp.openssl_verify_mode }}
SMTP_OPENSSL_VERIFY_MODE: {{ .Values.smtp.openssl_verify_mode }} SMTP_OPENSSL_VERIFY_MODE: {{ .Values.mastodon.smtp.openssl_verify_mode }}
{{- end }} {{- end }}
{{- if .Values.smtp.password }} {{- if .Values.mastodon.smtp.password }}
SMTP_PASSWORD: {{ .Values.smtp.password }} SMTP_PASSWORD: {{ .Values.mastodon.smtp.password }}
{{- end }} {{- end }}
{{- if .Values.smtp.port }} {{- if .Values.mastodon.smtp.port }}
SMTP_PORT: {{ .Values.smtp.port | quote }} SMTP_PORT: {{ .Values.mastodon.smtp.port | quote }}
{{- end }} {{- end }}
{{- if .Values.smtp.reply_to }} {{- if .Values.mastodon.smtp.reply_to }}
SMTP_REPLY_TO: {{ .Values.smtp.reply_to }} SMTP_REPLY_TO: {{ .Values.mastodon.smtp.reply_to }}
{{- end }} {{- end }}
{{- if .Values.smtp.server }} {{- if .Values.mastodon.smtp.server }}
SMTP_SERVER: {{ .Values.smtp.server }} SMTP_SERVER: {{ .Values.mastodon.smtp.server }}
{{- end }} {{- end }}
{{- if .Values.smtp.tls }} {{- if .Values.mastodon.smtp.tls }}
SMTP_TLS: {{ .Values.smtp.tls | quote }} SMTP_TLS: {{ .Values.mastodon.smtp.tls | quote }}
{{- end }} {{- end }}
STREAMING_CLUSTER_NUM: {{ .Values.application.streaming.workers | quote }} STREAMING_CLUSTER_NUM: {{ .Values.mastodon.streaming.workers | quote }}

View File

@ -1,4 +1,4 @@
{{ if .Values.cron.removeMedia.enabled }} {{ if .Values.mastodon.cron.removeMedia.enabled }}
apiVersion: batch/v1beta1 apiVersion: batch/v1beta1
kind: CronJob kind: CronJob
metadata: metadata:
@ -6,7 +6,7 @@ metadata:
labels: labels:
{{- include "mastodon.labels" . | nindent 4 }} {{- include "mastodon.labels" . | nindent 4 }}
spec: spec:
schedule: {{ .Values.cron.removeMedia.schedule }} schedule: {{ .Values.mastodon.cron.removeMedia.schedule }}
jobTemplate: jobTemplate:
spec: spec:
template: template:
@ -16,7 +16,7 @@ spec:
restartPolicy: OnFailure restartPolicy: OnFailure
# ensure we run on the same node as the other rails components; only # ensure we run on the same node as the other rails components; only
# required when using PVCs that are ReadWriteOnce # 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: affinity:
podAffinity: podAffinity:
requiredDuringSchedulingIgnoredDuringExecution: requiredDuringSchedulingIgnoredDuringExecution:
@ -64,7 +64,7 @@ spec:
name: {{ .Release.Name }}-redis name: {{ .Release.Name }}-redis
key: redis-password key: redis-password
- name: "PORT" - name: "PORT"
value: {{ .Values.application.web.port | quote }} value: {{ .Values.mastodon.web.port | quote }}
volumeMounts: volumeMounts:
- name: assets - name: assets
mountPath: /opt/mastodon/public/assets mountPath: /opt/mastodon/public/assets

View File

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

View File

@ -55,10 +55,10 @@ spec:
name: {{ .Release.Name }}-redis name: {{ .Release.Name }}-redis
key: redis-password key: redis-password
- name: "PORT" - name: "PORT"
value: {{ .Values.application.streaming.port | quote }} value: {{ .Values.mastodon.streaming.port | quote }}
ports: ports:
- name: streaming - name: streaming
containerPort: {{ .Values.application.streaming.port }} containerPort: {{ .Values.mastodon.streaming.port }}
protocol: TCP protocol: TCP
livenessProbe: livenessProbe:
httpGet: httpGet:

View File

@ -71,7 +71,7 @@ spec:
name: {{ .Release.Name }}-redis name: {{ .Release.Name }}-redis
key: redis-password key: redis-password
- name: "PORT" - name: "PORT"
value: {{ .Values.application.web.port | quote }} value: {{ .Values.mastodon.web.port | quote }}
volumeMounts: volumeMounts:
- name: assets - name: assets
mountPath: /opt/mastodon/public/assets mountPath: /opt/mastodon/public/assets
@ -79,7 +79,7 @@ spec:
mountPath: /opt/mastodon/public/system mountPath: /opt/mastodon/public/system
ports: ports:
- name: http - name: http
containerPort: {{ .Values.application.web.port }} containerPort: {{ .Values.mastodon.web.port }}
protocol: TCP protocol: TCP
livenessProbe: livenessProbe:
httpGet: httpGet:

View File

@ -1,6 +1,7 @@
{{- if .Values.ingress.enabled -}} {{- if .Values.ingress.enabled -}}
{{- $fullName := include "mastodon.fullname" . -}} {{- $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 -}} {{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1beta1
{{- else -}} {{- else -}}
@ -27,15 +28,19 @@ spec:
{{- end }} {{- end }}
{{- end }} {{- end }}
rules: rules:
- host: {{ .Values.ingress.hostname | quote }} {{- range .Values.ingress.hosts }}
- host: {{ .host | quote }}
http: http:
paths: paths:
- path: '/' {{- range .paths }}
- path: {{ .path }}
backend: backend:
serviceName: {{ $fullName }}-web serviceName: {{ $fullName }}-web
servicePort: {{ $svcPort }} servicePort: {{ $webPort }}
- path: '/api/v1/streaming' - path: {{ .path }}api/v1/streaming
backend: backend:
serviceName: {{ $fullName }}-streaming serviceName: {{ $fullName }}-streaming
servicePort: {{ .Values.application.streaming.port }} servicePort: {{ $streamingPort }}
{{- end }}
{{- end }}
{{- end }} {{- end }}

View File

@ -16,7 +16,7 @@ spec:
restartPolicy: Never restartPolicy: Never
# ensure we run on the same node as the other rails components; only # ensure we run on the same node as the other rails components; only
# required when using PVCs that are ReadWriteOnce # 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: affinity:
podAffinity: podAffinity:
requiredDuringSchedulingIgnoredDuringExecution: requiredDuringSchedulingIgnoredDuringExecution:
@ -65,7 +65,7 @@ spec:
name: {{ .Release.Name }}-redis name: {{ .Release.Name }}-redis
key: redis-password key: redis-password
- name: "PORT" - name: "PORT"
value: {{ .Values.application.web.port | quote }} value: {{ .Values.mastodon.web.port | quote }}
volumeMounts: volumeMounts:
- name: assets - name: assets
mountPath: /opt/mastodon/public/assets mountPath: /opt/mastodon/public/assets

View File

@ -17,7 +17,7 @@ spec:
restartPolicy: Never restartPolicy: Never
# ensure we run on the same node as the other rails components; only # ensure we run on the same node as the other rails components; only
# required when using PVCs that are ReadWriteOnce # 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: affinity:
podAffinity: podAffinity:
requiredDuringSchedulingIgnoredDuringExecution: requiredDuringSchedulingIgnoredDuringExecution:
@ -66,7 +66,7 @@ spec:
name: {{ .Release.Name }}-redis name: {{ .Release.Name }}-redis
key: redis-password key: redis-password
- name: "PORT" - name: "PORT"
value: {{ .Values.application.web.port | quote }} value: {{ .Values.mastodon.web.port | quote }}
volumeMounts: volumeMounts:
- name: assets - name: assets
mountPath: /opt/mastodon/public/assets mountPath: /opt/mastodon/public/assets

View File

@ -1,4 +1,4 @@
{{- if .Values.createAdmin.enabled }} {{- if .Values.mastodon.createAdmin.enabled }}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
@ -17,7 +17,7 @@ spec:
restartPolicy: Never restartPolicy: Never
# ensure we run on the same node as the other rails components; only # ensure we run on the same node as the other rails components; only
# required when using PVCs that are ReadWriteOnce # 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: affinity:
podAffinity: podAffinity:
requiredDuringSchedulingIgnoredDuringExecution: requiredDuringSchedulingIgnoredDuringExecution:
@ -44,9 +44,9 @@ spec:
- bin/tootctl - bin/tootctl
- accounts - accounts
- create - create
- {{ .Values.createAdmin.username }} - {{ .Values.mastodon.createAdmin.username }}
- --email - --email
- {{ .Values.createAdmin.email }} - {{ .Values.mastodon.createAdmin.email }}
- --confirmed - --confirmed
- --role - --role
- admin - admin
@ -71,7 +71,7 @@ spec:
name: {{ .Release.Name }}-redis name: {{ .Release.Name }}-redis
key: redis-password key: redis-password
- name: "PORT" - name: "PORT"
value: {{ .Values.application.web.port | quote }} value: {{ .Values.mastodon.web.port | quote }}
volumeMounts: volumeMounts:
- name: assets - name: assets
mountPath: /opt/mastodon/public/assets mountPath: /opt/mastodon/public/assets

View File

@ -16,7 +16,7 @@ spec:
restartPolicy: Never restartPolicy: Never
# ensure we run on the same node as the other rails components; only # ensure we run on the same node as the other rails components; only
# required when using PVCs that are ReadWriteOnce # 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: affinity:
podAffinity: podAffinity:
requiredDuringSchedulingIgnoredDuringExecution: requiredDuringSchedulingIgnoredDuringExecution:
@ -65,7 +65,7 @@ spec:
name: {{ .Release.Name }}-redis name: {{ .Release.Name }}-redis
key: redis-password key: redis-password
- name: "PORT" - name: "PORT"
value: {{ .Values.application.web.port | quote }} value: {{ .Values.mastodon.web.port | quote }}
volumeMounts: volumeMounts:
- name: assets - name: assets
mountPath: /opt/mastodon/public/assets mountPath: /opt/mastodon/public/assets

View File

@ -7,7 +7,7 @@ metadata:
{{- include "mastodon.labels" . | nindent 4 }} {{- include "mastodon.labels" . | nindent 4 }}
spec: spec:
accessModes: accessModes:
- {{ .Values.persistence.system.accessMode }} - {{ .Values.mastodon.persistence.system.accessMode }}
resources: resources:
{{- toYaml .Values.persistence.assets.resources | nindent 4}} {{- toYaml .Values.mastodon.persistence.assets.resources | nindent 4}}
storageClassName: {{ .Values.persistence.assets.storageClassName }} storageClassName: {{ .Values.mastodon.persistence.assets.storageClassName }}

View File

@ -7,7 +7,7 @@ metadata:
{{- include "mastodon.labels" . | nindent 4 }} {{- include "mastodon.labels" . | nindent 4 }}
spec: spec:
accessModes: accessModes:
- {{ .Values.persistence.system.accessMode }} - {{ .Values.mastodon.persistence.system.accessMode }}
resources: resources:
{{- toYaml .Values.persistence.system.resources | nindent 4}} {{- toYaml .Values.mastodon.persistence.system.resources | nindent 4}}
storageClassName: {{ .Values.persistence.system.storageClassName }} storageClassName: {{ .Values.mastodon.persistence.system.storageClassName }}

View File

@ -6,25 +6,25 @@ metadata:
{{- include "mastodon.labels" . | nindent 4 }} {{- include "mastodon.labels" . | nindent 4 }}
type: Opaque type: Opaque
data: data:
{{- if not (empty .Values.secrets.secret_key_base) }} {{- if not (empty .Values.mastodon.secrets.secret_key_base) }}
SECRET_KEY_BASE: "{{ .Values.secrets.secret_key_base | b64enc }}" SECRET_KEY_BASE: "{{ .Values.mastodon.secrets.secret_key_base | b64enc }}"
{{- else }} {{- 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 }} {{- end }}
{{- if not (empty .Values.secrets.otp_secret) }} {{- if not (empty .Values.mastodon.secrets.otp_secret) }}
OTP_SECRET: "{{ .Values.secrets.otp_secret | b64enc }}" OTP_SECRET: "{{ .Values.mastodon.secrets.otp_secret | b64enc }}"
{{- else }} {{- 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 }} {{- end }}
{{- if not (empty .Values.secrets.vapid.private_key) }} {{- if not (empty .Values.mastodon.secrets.vapid.private_key) }}
VAPID_PRIVATE_KEY: "{{ .Values.secrets.vapid.private_key | b64enc }}" VAPID_PRIVATE_KEY: "{{ .Values.mastodon.secrets.vapid.private_key | b64enc }}"
{{- else }} {{- 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 }} {{- end }}
{{- if not (empty .Values.secrets.vapid.public_key) }} {{- if not (empty .Values.mastodon.secrets.vapid.public_key) }}
VAPID_PUBLIC_KEY: "{{ .Values.secrets.vapid.public_key | b64enc }}" VAPID_PUBLIC_KEY: "{{ .Values.mastodon.secrets.vapid.public_key | b64enc }}"
{{- else }} {{- 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 }} {{- end }}
{{- if not .Values.postgresql.enabled }} {{- if not .Values.postgresql.enabled }}
postgresql-password: "{{ .Values.postgresql.postgresqlPassword | b64enc }}" postgresql-password: "{{ .Values.postgresql.postgresqlPassword | b64enc }}"

View File

@ -7,7 +7,7 @@ metadata:
spec: spec:
type: {{ .Values.service.type }} type: {{ .Values.service.type }}
ports: ports:
- port: {{ .Values.application.streaming.port }} - port: {{ .Values.mastodon.streaming.port }}
targetPort: streaming targetPort: streaming
protocol: TCP protocol: TCP
name: streaming name: streaming

View File

@ -7,7 +7,7 @@ metadata:
spec: spec:
type: {{ .Values.service.type }} type: {{ .Values.service.type }}
ports: ports:
- port: {{ .Values.service.port }} - port: {{ .Values.mastodon.web.port }}
targetPort: http targetPort: http
protocol: TCP protocol: TCP
name: http name: http

View File

@ -2,70 +2,55 @@ replicaCount: 1
image: image:
repository: tootsuite/mastodon repository: tootsuite/mastodon
pullPolicy: Always
# https://hub.docker.com/r/tootsuite/mastodon/tags # https://hub.docker.com/r/tootsuite/mastodon/tags
tag: v3.3.0 #
# alternatively, use `latest` for the latest release or `edge` for the image # alternatively, use `latest` for the latest release or `edge` for the image
# built from the most recent commit # built from the most recent commit
# #
# tag: latest # tag: latest
tag: v3.3.0
# use `Always` when using `latest` tag
pullPolicy: IfNotPresent
ingress: mastodon:
enabled: false # create an initial administrator user; the password is autogenerated and will
annotations: # have to be reset
kubernetes.io/ingress.class: nginx createAdmin:
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
# create an initial administrator user; the password is autogenerated and will
# have to be reset
createAdmin:
enabled: false enabled: false
username: not_gargron username: not_gargron
email: not@example.com email: not@example.com
cron:
# available locales: https://github.com/tootsuite/mastodon/blob/master/config/application.rb#L43
locale: en
cron:
# run `tootctl media remove` every week # run `tootctl media remove` every week
removeMedia: removeMedia:
enabled: true enabled: true
schedule: "0 0 * * 0" schedule: "0 0 * * 0"
# available locales: https://github.com/tootsuite/mastodon/blob/master/config/application.rb#L43
application: locale: en
web: local_domain: mastodon.local
port: 3000 persistence:
streaming: assets:
port: 4000 # ReadWriteOnce is more widely supported than ReadWriteMany, but limits
# this should be set manually since os.cpus() returns the number of CPUs on # scalability, since it requires the Rails and Sidekiq pods to run on the
# the node running the pod, which is unrelated to the resources allocated to # same node.
# the pod by k8s accessMode: ReadWriteOnce
workers: 1 resources:
sidekiq: requests:
concurrency: 25 storage: 10Gi
system:
# these must be set manually; autogenerated keys are rotated on each upgrade accessMode: ReadWriteOnce
secrets: resources:
requests:
storage: 100Gi
# these must be set manually; autogenerated keys are rotated on each upgrade
secrets:
secret_key_base: "" secret_key_base: ""
otp_secret: "" otp_secret: ""
vapid: vapid:
private_key: "" private_key: ""
public_key: "" public_key: ""
sidekiq:
smtp: concurrency: 25
smtp:
auth_method: plain auth_method: plain
ca_file: ca_file:
delivery_method: smtp delivery_method: smtp
@ -79,6 +64,35 @@ smtp:
reply_to: reply_to:
server: smtp.mailgun.org server: smtp.mailgun.org
tls: false 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 # https://github.com/bitnami/charts/tree/master/bitnami/elasticsearch#parameters
elasticsearch: elasticsearch:
@ -112,21 +126,6 @@ redis:
# rotated on each upgrade: # rotated on each upgrade:
password: "" 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: service:
type: ClusterIP type: ClusterIP
port: 80 port: 80