mastodon: bump to v4.4.1, helm chart v6.5.0
This commit is contained in:
		
							
								
								
									
										111
									
								
								mastodon/templates/_db-migrate.tpl
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										111
									
								
								mastodon/templates/_db-migrate.tpl
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,111 @@
 | 
			
		||||
{{/* vim: set filetype=mustache: */}}
 | 
			
		||||
{{/*
 | 
			
		||||
Spec template for DB migration pre- and post-install/upgrade jobs.
 | 
			
		||||
*/}}
 | 
			
		||||
{{- define "mastodon.dbMigrateJob" -}}
 | 
			
		||||
apiVersion: batch/v1
 | 
			
		||||
kind: Job
 | 
			
		||||
metadata:
 | 
			
		||||
  {{- if .prepare }}
 | 
			
		||||
  name: {{ include "mastodon.fullname" . }}-db-prepare
 | 
			
		||||
  {{- else if .preDeploy }}
 | 
			
		||||
  name: {{ include "mastodon.fullname" . }}-db-pre-migrate
 | 
			
		||||
  {{- else }}
 | 
			
		||||
  name: {{ include "mastodon.fullname" . }}-db-post-migrate
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  labels:
 | 
			
		||||
    {{- include "mastodon.labels" . | nindent 4 }}
 | 
			
		||||
  annotations:
 | 
			
		||||
    {{- if .prepare }}
 | 
			
		||||
    "helm.sh/hook": pre-install
 | 
			
		||||
    {{- else if .preDeploy }}
 | 
			
		||||
    "helm.sh/hook": pre-upgrade
 | 
			
		||||
    {{- else }}
 | 
			
		||||
    "helm.sh/hook": post-install,post-upgrade
 | 
			
		||||
    {{- end }}
 | 
			
		||||
    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
 | 
			
		||||
    {{- if .prepare }}
 | 
			
		||||
    "helm.sh/hook-weight": "-3"
 | 
			
		||||
    {{- else }}
 | 
			
		||||
    "helm.sh/hook-weight": "-2"
 | 
			
		||||
    {{- end }}
 | 
			
		||||
spec:
 | 
			
		||||
  template:
 | 
			
		||||
    metadata:
 | 
			
		||||
      name: {{ include "mastodon.fullname" . }}-db-migrate
 | 
			
		||||
      {{- with .Values.jobAnnotations }}
 | 
			
		||||
      annotations:
 | 
			
		||||
        {{- toYaml . | nindent 8 }}
 | 
			
		||||
      {{- end }}
 | 
			
		||||
    spec:
 | 
			
		||||
      restartPolicy: Never
 | 
			
		||||
      containers:
 | 
			
		||||
        - name: {{ include "mastodon.fullname" . }}-db-migrate
 | 
			
		||||
          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
 | 
			
		||||
          imagePullPolicy: {{ .Values.image.pullPolicy }}
 | 
			
		||||
          command:
 | 
			
		||||
            - bundle
 | 
			
		||||
            - exec
 | 
			
		||||
            - rake
 | 
			
		||||
            {{- if .prepare }}
 | 
			
		||||
            - db:prepare
 | 
			
		||||
            {{- else }}
 | 
			
		||||
            - db:migrate
 | 
			
		||||
            {{- end }}
 | 
			
		||||
          envFrom:
 | 
			
		||||
            - secretRef:
 | 
			
		||||
                name: {{ template "mastodon.secretName" . }}
 | 
			
		||||
          env:
 | 
			
		||||
            - name: "DB_HOST"
 | 
			
		||||
              value: {{ template "mastodon.postgres.direct.host" . }}
 | 
			
		||||
            - name: "DB_PORT"
 | 
			
		||||
              value: {{ template "mastodon.postgres.direct.port" . }}
 | 
			
		||||
            - name: "DB_NAME"
 | 
			
		||||
              value: {{ template "mastodon.postgres.direct.database" . }}
 | 
			
		||||
            - name: "DB_USER"
 | 
			
		||||
              value: {{ .Values.postgresql.auth.username }}
 | 
			
		||||
            - name: "DB_PASS"
 | 
			
		||||
              valueFrom:
 | 
			
		||||
                secretKeyRef:
 | 
			
		||||
                  name: {{ template "mastodon.postgresql.secretName" . }}
 | 
			
		||||
                  key: password
 | 
			
		||||
            - name: "REDIS_HOST"
 | 
			
		||||
              value: {{ template "mastodon.redis.host" . }}
 | 
			
		||||
            - name: "REDIS_PORT"
 | 
			
		||||
              value: {{ .Values.redis.port | default "6379" | quote }}
 | 
			
		||||
            {{- if .Values.redis.sidekiq.enabled }}
 | 
			
		||||
            {{- if .Values.redis.sidekiq.hostname }}
 | 
			
		||||
            - name: SIDEKIQ_REDIS_HOST
 | 
			
		||||
              value: {{ .Values.redis.sidekiq.hostname }}
 | 
			
		||||
            {{- end }}
 | 
			
		||||
            {{- if .Values.redis.sidekiq.port }}
 | 
			
		||||
            - name: SIDEKIQ_REDIS_PORT
 | 
			
		||||
              value: {{ .Values.redis.sidekiq.port | quote }}
 | 
			
		||||
            {{- end }}
 | 
			
		||||
            {{- end }}
 | 
			
		||||
            {{- if .Values.redis.cache.enabled }}
 | 
			
		||||
            {{- if .Values.redis.cache.hostname }}
 | 
			
		||||
            - name: CACHE_REDIS_HOST
 | 
			
		||||
              value: {{ .Values.redis.cache.hostname }}
 | 
			
		||||
            {{- end }}
 | 
			
		||||
            {{- if .Values.redis.cache.port }}
 | 
			
		||||
            - name: CACHE_REDIS_PORT
 | 
			
		||||
              value: {{ .Values.redis.cache.port | quote }}
 | 
			
		||||
            {{- end }}
 | 
			
		||||
            {{- end }}
 | 
			
		||||
            - name: "REDIS_DRIVER"
 | 
			
		||||
              value: "ruby"
 | 
			
		||||
            - name: "REDIS_PASSWORD"
 | 
			
		||||
              valueFrom:
 | 
			
		||||
                secretKeyRef:
 | 
			
		||||
                  {{- if and (.prepare) (not .Values.redis.enabled) (not .Values.redis.auth.existingSecret) (not .Values.redis.existingSecret) (.Values.redis.auth.password) }}
 | 
			
		||||
                  name: {{ template "mastodon.redis.secretName" . }}-pre-install
 | 
			
		||||
                  {{- else }}
 | 
			
		||||
                  name: {{ template "mastodon.redis.secretName" . }}
 | 
			
		||||
                  {{- end }}
 | 
			
		||||
                  key: redis-password
 | 
			
		||||
          {{- if .preDeploy }}
 | 
			
		||||
            - name: "SKIP_POST_DEPLOYMENT_MIGRATIONS"
 | 
			
		||||
              value: "true"
 | 
			
		||||
          {{- end }}
 | 
			
		||||
{{- end }}
 | 
			
		||||
@@ -47,7 +47,9 @@ Common labels
 | 
			
		||||
helm.sh/chart: {{ include "mastodon.chart" . }}
 | 
			
		||||
{{ include "mastodon.selectorLabels" . }}
 | 
			
		||||
{{ include "mastodon.globalLabels" . }}
 | 
			
		||||
{{- if .Chart.AppVersion }}
 | 
			
		||||
{{- if .Values.image.tag }}
 | 
			
		||||
app.kubernetes.io/version: {{ regexReplaceAll "@(\\w+:\\w{0,7})\\w*" .Values.image.tag "@${1}" | quote }}
 | 
			
		||||
{{- else if .Chart.AppVersion }}
 | 
			
		||||
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 | 
			
		||||
{{- end }}
 | 
			
		||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
 | 
			
		||||
@@ -90,7 +92,7 @@ Create the name of the assets persistent volume to use
 | 
			
		||||
{{- if .Values.mastodon.persistence.assets.existingClaim }}
 | 
			
		||||
    {{- printf "%s" (tpl .Values.mastodon.persistence.assets.existingClaim $) -}}
 | 
			
		||||
{{- else -}}
 | 
			
		||||
    {{- printf "%s-assets" (include "common.names.fullname" .) -}}
 | 
			
		||||
    {{- printf "%s-assets" (include "mastodon.fullname" .) -}}
 | 
			
		||||
{{- end -}}
 | 
			
		||||
{{- end -}}
 | 
			
		||||
 | 
			
		||||
@@ -101,7 +103,7 @@ Create the name of the system persistent volume to use
 | 
			
		||||
{{- if .Values.mastodon.persistence.system.existingClaim }}
 | 
			
		||||
    {{- printf "%s" (tpl .Values.mastodon.persistence.system.existingClaim $) -}}
 | 
			
		||||
{{- else -}}
 | 
			
		||||
    {{- printf "%s-system" (include "common.names.fullname" .) -}}
 | 
			
		||||
    {{- printf "%s-system" (include "mastodon.fullname" .) -}}
 | 
			
		||||
{{- end -}}
 | 
			
		||||
{{- end -}}
 | 
			
		||||
 | 
			
		||||
@@ -121,6 +123,60 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 | 
			
		||||
{{- printf "%s-%s" .Release.Name "postgresql" | trunc 63 | trimSuffix "-" -}}
 | 
			
		||||
{{- end -}}
 | 
			
		||||
 | 
			
		||||
{{/*
 | 
			
		||||
Establish which values we will use for remote connections
 | 
			
		||||
*/}}
 | 
			
		||||
{{- define "mastodon.postgres.host" -}}
 | 
			
		||||
{{- if .Values.postgresql.enabled }}
 | 
			
		||||
{{- printf "%s" (include "mastodon.postgresql.fullname" .) -}}
 | 
			
		||||
{{- else }}
 | 
			
		||||
{{- printf "%s" (required "When the postgresql chart is disabled .Values.postgresql.postgresqlHostname is required" .Values.postgresql.postgresqlHostname) -}}
 | 
			
		||||
{{- end }}
 | 
			
		||||
{{- end }}
 | 
			
		||||
 | 
			
		||||
{{- define "mastodon.postgres.port" -}}
 | 
			
		||||
{{- if .Values.postgresql.enabled }}
 | 
			
		||||
{{- printf "%d" 5432 | int | quote -}}
 | 
			
		||||
{{- else }}
 | 
			
		||||
{{- printf "%d" | default 5432 .Values.postgresql.postgresqlPort | int | quote -}}
 | 
			
		||||
{{- end }}
 | 
			
		||||
{{- end }}
 | 
			
		||||
 | 
			
		||||
{{/*
 | 
			
		||||
Establish which values we will use for direct remote DB connections
 | 
			
		||||
*/}}
 | 
			
		||||
{{- define "mastodon.postgres.direct.host" -}}
 | 
			
		||||
{{- if .Values.postgresql.direct.hostname }}
 | 
			
		||||
{{- printf "%s" .Values.postgresql.direct.hostname -}}
 | 
			
		||||
{{- else }}
 | 
			
		||||
{{- printf "%s" (include "mastodon.postgres.host" .) -}}
 | 
			
		||||
{{- end }}
 | 
			
		||||
{{- end }}
 | 
			
		||||
 | 
			
		||||
{{- define "mastodon.postgres.direct.port" -}}
 | 
			
		||||
{{- if .Values.postgresql.direct.port }}
 | 
			
		||||
{{- printf "%d" (int .Values.postgresql.direct.port) | quote -}}
 | 
			
		||||
{{- else }}
 | 
			
		||||
{{- printf "%s" (include "mastodon.postgres.port" .) -}}
 | 
			
		||||
{{- end }}
 | 
			
		||||
{{- end }}
 | 
			
		||||
 | 
			
		||||
{{- define "mastodon.postgres.direct.database" -}}
 | 
			
		||||
{{- if .Values.postgresql.direct.database }}
 | 
			
		||||
{{- printf "%s" .Values.postgresql.direct.database -}}
 | 
			
		||||
{{- else }}
 | 
			
		||||
{{- printf "%s" .Values.postgresql.auth.database -}}
 | 
			
		||||
{{- end }}
 | 
			
		||||
{{- end }}
 | 
			
		||||
 | 
			
		||||
{{- define "mastodon.redis.host" -}}
 | 
			
		||||
{{- if .Values.redis.enabled }}
 | 
			
		||||
{{- printf "%s-%s" (include "mastodon.redis.fullname" .) "master" -}}
 | 
			
		||||
{{- else }}
 | 
			
		||||
{{- printf "%s" (required "When the redis chart is disabled .Values.redis.hostname is required" .Values.redis.hostname) -}}
 | 
			
		||||
{{- end }}
 | 
			
		||||
{{- end }}
 | 
			
		||||
 | 
			
		||||
{{/*
 | 
			
		||||
Get the mastodon secret.
 | 
			
		||||
*/}}
 | 
			
		||||
@@ -133,7 +189,7 @@ Get the mastodon secret.
 | 
			
		||||
{{- end -}}
 | 
			
		||||
 | 
			
		||||
{{/*
 | 
			
		||||
Get the smtp secret.
 | 
			
		||||
Get the smtp secrets.
 | 
			
		||||
*/}}
 | 
			
		||||
{{- define "mastodon.smtp.secretName" -}}
 | 
			
		||||
{{- if .Values.mastodon.smtp.existingSecret }}
 | 
			
		||||
@@ -143,6 +199,14 @@ Get the smtp secret.
 | 
			
		||||
{{- end -}}
 | 
			
		||||
{{- end -}}
 | 
			
		||||
 | 
			
		||||
{{- define "mastodon.smtp.bulk.secretName" -}}
 | 
			
		||||
{{- if .Values.mastodon.smtp.bulk.existingSecret }}
 | 
			
		||||
    {{- printf "%s" (tpl .Values.mastodon.smtp.bulk.existingSecret $) -}}
 | 
			
		||||
{{- else -}}
 | 
			
		||||
    {{- printf "%s-smtp-bulk" (include "mastodon.fullname" .) -}}
 | 
			
		||||
{{- end -}}
 | 
			
		||||
{{- end -}}
 | 
			
		||||
 | 
			
		||||
{{/*
 | 
			
		||||
Get the postgresql secret.
 | 
			
		||||
*/}}
 | 
			
		||||
@@ -214,18 +278,6 @@ Return true if a mastodon secret object should be created
 | 
			
		||||
{{- end -}}
 | 
			
		||||
{{- end -}}
 | 
			
		||||
 | 
			
		||||
{{/*
 | 
			
		||||
Find highest number of needed database connections to set DB_POOL variable
 | 
			
		||||
*/}}
 | 
			
		||||
{{- define "mastodon.maxDbPool" -}}
 | 
			
		||||
{{/* Default MAX_THREADS for Puma is 5 */}}
 | 
			
		||||
{{- $poolSize := 5 }}
 | 
			
		||||
{{- range .Values.mastodon.sidekiq.workers }}
 | 
			
		||||
{{- $poolSize = max $poolSize .concurrency }}
 | 
			
		||||
{{- end }}
 | 
			
		||||
{{- $poolSize | quote }}
 | 
			
		||||
{{- end }}
 | 
			
		||||
 | 
			
		||||
{{/*
 | 
			
		||||
Full hostname for a custom Elasticsearch cluster
 | 
			
		||||
*/}}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										65
									
								
								mastodon/templates/_secrets.tpl
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										65
									
								
								mastodon/templates/_secrets.tpl
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,65 @@
 | 
			
		||||
{{/* vim: set filetype=mustache: */}}
 | 
			
		||||
{{/*
 | 
			
		||||
Spec template for mastodon secrets object.
 | 
			
		||||
*/}}
 | 
			
		||||
{{- define "mastodon.secrets.object" -}}
 | 
			
		||||
apiVersion: v1
 | 
			
		||||
kind: Secret
 | 
			
		||||
metadata:
 | 
			
		||||
  name: {{ template "mastodon.fullname" . }}
 | 
			
		||||
  labels:
 | 
			
		||||
    {{- include "mastodon.labels" . | nindent 4 }}
 | 
			
		||||
  annotations:
 | 
			
		||||
    "helm.sh/hook": pre-install
 | 
			
		||||
    "helm.sh/hook-weight": "-4"
 | 
			
		||||
type: Opaque
 | 
			
		||||
data:
 | 
			
		||||
  {{- if .Values.mastodon.s3.enabled }}
 | 
			
		||||
  {{- if not .Values.mastodon.s3.existingSecret }}
 | 
			
		||||
  AWS_ACCESS_KEY_ID: "{{ .Values.mastodon.s3.access_key | b64enc }}"
 | 
			
		||||
  AWS_SECRET_ACCESS_KEY: "{{ .Values.mastodon.s3.access_secret | b64enc }}"
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- if not .Values.mastodon.secrets.existingSecret }}
 | 
			
		||||
  {{- 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.mastodon.secrets.secret_key_base }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- 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.mastodon.secrets.otp_secret }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- 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.mastodon.secrets.vapid.private_key }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- 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.mastodon.secrets.vapid.public_key }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- if not (empty .Values.mastodon.secrets.activeRecordEncryption.primaryKey) }}
 | 
			
		||||
  ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY: "{{ .Values.mastodon.secrets.activeRecordEncryption.primaryKey | b64enc }}"
 | 
			
		||||
  {{- else }}
 | 
			
		||||
  ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY: {{ required "activeRecordEncryption.primaryKey is required" .Values.mastodon.secrets.activeRecordEncryption.primaryKey }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- if not (empty .Values.mastodon.secrets.activeRecordEncryption.deterministicKey) }}
 | 
			
		||||
  ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY: "{{ .Values.mastodon.secrets.activeRecordEncryption.deterministicKey | b64enc }}"
 | 
			
		||||
  {{- else }}
 | 
			
		||||
  ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY: {{ required "activeRecordEncryption.deterministicKey is required" .Values.mastodon.secrets.activeRecordEncryption.deterministicKey }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- if not (empty .Values.mastodon.secrets.activeRecordEncryption.keyDerivationSalt) }}
 | 
			
		||||
  ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT: "{{ .Values.mastodon.secrets.activeRecordEncryption.keyDerivationSalt | b64enc }}"
 | 
			
		||||
  {{- else }}
 | 
			
		||||
  ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT: {{ required "activeRecordEncryption.keyDerivationSalt is required" .Values.mastodon.secrets.activeRecordEncryption.keyDerivationSalt }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- if not .Values.postgresql.enabled }}
 | 
			
		||||
  {{- if not .Values.postgresql.auth.existingSecret }}
 | 
			
		||||
  password: "{{ .Values.postgresql.auth.password | b64enc }}"
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
{{- end }}
 | 
			
		||||
@@ -5,21 +5,15 @@ metadata:
 | 
			
		||||
  labels:
 | 
			
		||||
    {{- include "mastodon.labels" . | nindent 4 }}
 | 
			
		||||
data:
 | 
			
		||||
  {{- if .Values.postgresql.enabled }}
 | 
			
		||||
  DB_HOST: {{ template "mastodon.postgresql.fullname" . }}
 | 
			
		||||
  DB_PORT: "5432"
 | 
			
		||||
  {{- else }}
 | 
			
		||||
  DB_HOST: {{ .Values.postgresql.postgresqlHostname }}
 | 
			
		||||
  DB_PORT: {{ .Values.postgresql.postgresqlPort | default "5432" | quote }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  DB_HOST: {{ template "mastodon.postgres.host" . }}
 | 
			
		||||
  DB_PORT: {{ template "mastodon.postgres.port" . }}
 | 
			
		||||
  DB_NAME: {{ .Values.postgresql.auth.database }}
 | 
			
		||||
  DB_POOL: {{ include "mastodon.maxDbPool" . }}
 | 
			
		||||
  DB_USER: {{ .Values.postgresql.auth.username }}
 | 
			
		||||
  {{- if .Values.postgresql.readReplica.hostname }}
 | 
			
		||||
  REPLICA_DB_HOST: {{ .Values.postgresql.readReplica.hostname }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- if .Values.postgresql.readReplica.port }}
 | 
			
		||||
  REPLICA_DB_PORT: {{ .Values.postgresql.readReplica.port }}
 | 
			
		||||
  REPLICA_DB_PORT: {{ .Values.postgresql.readReplica.port | quote }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- if .Values.postgresql.readReplica.auth.database }}
 | 
			
		||||
  REPLICA_DB_NAME: {{ .Values.postgresql.readReplica.auth.database }}
 | 
			
		||||
@@ -31,7 +25,9 @@ data:
 | 
			
		||||
  REPLICA_DB_PASS: {{ .Values.postgresql.readReplica.auth.password }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  PREPARED_STATEMENTS: {{ .Values.mastodon.preparedStatements | quote }}
 | 
			
		||||
  {{- if .Values.mastodon.locale }}
 | 
			
		||||
  DEFAULT_LOCALE: {{ .Values.mastodon.locale }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- if .Values.elasticsearch.enabled }}
 | 
			
		||||
  ES_ENABLED: "true"
 | 
			
		||||
  ES_PRESET: {{ .Values.elasticsearch.preset | default "single_node_cluster" | quote }}
 | 
			
		||||
@@ -66,11 +62,7 @@ data:
 | 
			
		||||
  MALLOC_ARENA_MAX: "2"
 | 
			
		||||
  NODE_ENV: "production"
 | 
			
		||||
  RAILS_ENV: "production"
 | 
			
		||||
  {{- if .Values.redis.enabled }}
 | 
			
		||||
  REDIS_HOST: {{ template "mastodon.redis.fullname" . }}-master
 | 
			
		||||
  {{- else }}
 | 
			
		||||
  REDIS_HOST: {{ required "When the redis chart is disabled .Values.redis.hostname is required" .Values.redis.hostname }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  REDIS_HOST: {{ template "mastodon.redis.host" . }}
 | 
			
		||||
  REDIS_PORT: {{ .Values.redis.port | default "6379" | quote }}
 | 
			
		||||
  {{- if .Values.redis.sidekiq.enabled }}
 | 
			
		||||
  {{- if .Values.redis.sidekiq.hostname }}
 | 
			
		||||
@@ -137,10 +129,10 @@ data:
 | 
			
		||||
  SMTP_ENABLE_STARTTLS_AUTO: {{ . | quote }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- with .Values.mastodon.smtp.from_address }}
 | 
			
		||||
  SMTP_FROM_ADDRESS: {{ . }}
 | 
			
		||||
  SMTP_FROM_ADDRESS: {{ . | quote }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- with .Values.mastodon.smtp.return_path }}
 | 
			
		||||
  SMTP_RETURN_PATH: {{ . }}
 | 
			
		||||
  SMTP_RETURN_PATH: {{ . | quote }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- with .Values.mastodon.smtp.openssl_verify_mode }}
 | 
			
		||||
  SMTP_OPENSSL_VERIFY_MODE: {{ . }}
 | 
			
		||||
@@ -149,7 +141,7 @@ data:
 | 
			
		||||
  SMTP_PORT: {{ . | quote }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- with .Values.mastodon.smtp.reply_to }}
 | 
			
		||||
  SMTP_REPLY_TO: {{ . }}
 | 
			
		||||
  SMTP_REPLY_TO: {{ . | quote }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- with .Values.mastodon.smtp.server }}
 | 
			
		||||
  SMTP_SERVER: {{ . }}
 | 
			
		||||
@@ -157,10 +149,45 @@ data:
 | 
			
		||||
  {{- with .Values.mastodon.smtp.tls }}
 | 
			
		||||
  SMTP_TLS: {{ . | quote }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- if .Values.mastodon.smtp.bulk.enabled }}
 | 
			
		||||
  {{- with .Values.mastodon.smtp.bulk.auth_method }}
 | 
			
		||||
  BULK_SMTP_AUTH_METHOD: {{ . }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- with .Values.mastodon.smtp.bulk.ca_file }}
 | 
			
		||||
  BULK_SMTP_CA_FILE: {{ . }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- with .Values.mastodon.smtp.bulk.domain }}
 | 
			
		||||
  BULK_SMTP_DOMAIN: {{ . }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- with .Values.mastodon.smtp.bulk.enable_starttls }}
 | 
			
		||||
  BULK_SMTP_ENABLE_STARTTLS: {{ . | quote }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- with .Values.mastodon.smtp.bulk.enable_starttls_auto }}
 | 
			
		||||
  BULK_SMTP_ENABLE_STARTTLS_AUTO: {{ . | quote }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- with .Values.mastodon.smtp.bulk.from_address }}
 | 
			
		||||
  BULK_SMTP_FROM_ADDRESS: {{ . | quote }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- with .Values.mastodon.smtp.bulk.openssl_verify_mode }}
 | 
			
		||||
  BULK_SMTP_OPENSSL_VERIFY_MODE: {{ . }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- with .Values.mastodon.smtp.bulk.port }}
 | 
			
		||||
  BULK_SMTP_PORT: {{ . | quote }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- with .Values.mastodon.smtp.bulk.server }}
 | 
			
		||||
  BULK_SMTP_SERVER: {{ . }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- with .Values.mastodon.smtp.bulk.tls }}
 | 
			
		||||
  BULK_SMTP_TLS: {{ . | quote }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  STREAMING_CLUSTER_NUM: {{ .Values.mastodon.streaming.workers | quote }}
 | 
			
		||||
  {{- with .Values.mastodon.streaming.base_url }}
 | 
			
		||||
  STREAMING_API_BASE_URL: {{ . | quote }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- if .Values.mastodon.trusted_proxy_ip }}
 | 
			
		||||
  TRUSTED_PROXY_IP: {{ .Values.mastodon.trusted_proxy_ip }}
 | 
			
		||||
  {{ end }}
 | 
			
		||||
  {{- if .Values.externalAuth.oidc.enabled }}
 | 
			
		||||
  OIDC_ENABLED: {{ .Values.externalAuth.oidc.enabled | quote }}
 | 
			
		||||
  OIDC_DISPLAY_NAME: {{ .Values.externalAuth.oidc.display_name }}
 | 
			
		||||
 
 | 
			
		||||
@@ -107,4 +107,8 @@ spec:
 | 
			
		||||
                - name: system
 | 
			
		||||
                  mountPath: /opt/mastodon/public/system
 | 
			
		||||
              {{- end }}
 | 
			
		||||
          {{- with coalesce .Values.mastodon.cron.removeMedia.nodeSelector .Values.nodeSelector }}
 | 
			
		||||
          nodeSelector:
 | 
			
		||||
            {{- . | toYaml | nindent 12 }}
 | 
			
		||||
          {{- end }}
 | 
			
		||||
{{- end }}
 | 
			
		||||
 
 | 
			
		||||
@@ -7,19 +7,26 @@ metadata:
 | 
			
		||||
  name: {{ include "mastodon.fullname" $context }}-sidekiq-{{ .name }}
 | 
			
		||||
  labels:
 | 
			
		||||
    {{- include "mastodon.labels" $context | nindent 4 }}
 | 
			
		||||
    {{- with $context.Values.mastodon.sidekiq.labels }}
 | 
			
		||||
    {{- toYaml . | nindent 4 }}
 | 
			
		||||
    {{- end }}
 | 
			
		||||
    app.kubernetes.io/component: sidekiq-{{ .name }}
 | 
			
		||||
    app.kubernetes.io/part-of: rails
 | 
			
		||||
  annotations:
 | 
			
		||||
    {{- with $context.Values.deploymentAnnotations }}
 | 
			
		||||
    {{- toYaml . | nindent 4 }}
 | 
			
		||||
    {{- end }}
 | 
			
		||||
    {{- with $context.Values.mastodon.sidekiq.annotations }}
 | 
			
		||||
    {{- toYaml . | nindent 4 }}
 | 
			
		||||
    {{- end }}
 | 
			
		||||
spec:
 | 
			
		||||
  {{- if (has "scheduler" .queues) }}
 | 
			
		||||
    {{- if (gt (int .replicas) 1) }}
 | 
			
		||||
      {{ fail "The scheduler queue should never have more than 1 replicas" }}
 | 
			
		||||
    {{- end }}
 | 
			
		||||
  strategy:
 | 
			
		||||
    type: Recreate
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- if $context.Values.mastodon.sidekiq.updateStrategy }}
 | 
			
		||||
  strategy: {{- toYaml $context.Values.mastodon.sidekiq.updateStrategy | nindent 4 }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  replicas: {{ .replicas }}
 | 
			
		||||
  {{- if (ne (toString $context.Values.mastodon.revisionHistoryLimit) "<nil>") }}
 | 
			
		||||
@@ -36,6 +43,9 @@ spec:
 | 
			
		||||
        {{- with $context.Values.podAnnotations }}
 | 
			
		||||
        {{- toYaml . | nindent 8 }}
 | 
			
		||||
        {{- end }}
 | 
			
		||||
        {{- with $context.Values.mastodon.sidekiq.podAnnotations }}
 | 
			
		||||
        {{- toYaml . | nindent 8 }}
 | 
			
		||||
        {{- end }}
 | 
			
		||||
        # roll the pods to pick up any db migrations or other changes
 | 
			
		||||
        {{- include "mastodon.rollingPodAnnotations" $context | nindent 8 }}
 | 
			
		||||
        checksum/config-secrets-smtp: {{ include ( print $.Template.BasePath "/secret-smtp.yaml" ) $context | sha256sum | quote }}
 | 
			
		||||
@@ -43,6 +53,12 @@ spec:
 | 
			
		||||
        {{- include "mastodon.globalLabels" $context | nindent 8 }}
 | 
			
		||||
        {{- include "mastodon.selectorLabels" $context | nindent 8 }}
 | 
			
		||||
        {{- include "mastodon.statsdExporterLabels" $context | nindent 8 }}
 | 
			
		||||
        {{- with $context.Values.mastodon.podLabels }}
 | 
			
		||||
        {{- toYaml . | nindent 8 }}
 | 
			
		||||
        {{- end }}
 | 
			
		||||
        {{- with $context.Values.mastodon.sidekiq.podLabels }}
 | 
			
		||||
        {{- toYaml . | nindent 8 }}
 | 
			
		||||
        {{- end }}
 | 
			
		||||
        app.kubernetes.io/component: sidekiq-{{ .name }}
 | 
			
		||||
        app.kubernetes.io/part-of: rails
 | 
			
		||||
    spec:
 | 
			
		||||
@@ -159,6 +175,20 @@ spec:
 | 
			
		||||
                  name: {{ include "mastodon.smtp.secretName" $context }}
 | 
			
		||||
                  key: password
 | 
			
		||||
                  optional: true
 | 
			
		||||
            {{- if $context.Values.mastodon.smtp.bulk.enabled }}
 | 
			
		||||
            - name: "BULK_SMTP_LOGIN"
 | 
			
		||||
              valueFrom:
 | 
			
		||||
                secretKeyRef:
 | 
			
		||||
                  name: {{ include "mastodon.smtp.bulk.secretName" $context }}
 | 
			
		||||
                  key: login
 | 
			
		||||
                  optional: true
 | 
			
		||||
            - name: "BULK_SMTP_PASSWORD"
 | 
			
		||||
              valueFrom:
 | 
			
		||||
                secretKeyRef:
 | 
			
		||||
                  name: {{ include "mastodon.smtp.bulk.secretName" $context }}
 | 
			
		||||
                  key: password
 | 
			
		||||
                  optional: true
 | 
			
		||||
            {{- end }}
 | 
			
		||||
            {{- if (and $context.Values.mastodon.s3.enabled $context.Values.mastodon.s3.existingSecret) }}
 | 
			
		||||
            - name: "AWS_SECRET_ACCESS_KEY"
 | 
			
		||||
              valueFrom:
 | 
			
		||||
@@ -185,6 +215,33 @@ spec:
 | 
			
		||||
                  name: {{ $context.Values.mastodon.cacheBuster.authToken.existingSecret }}
 | 
			
		||||
                  key: password
 | 
			
		||||
            {{- end }}
 | 
			
		||||
            {{- if or $context.Values.mastodon.sidekiq.otel.enabled (and $context.Values.mastodon.otel.enabled (ne $context.Values.mastodon.sidekiq.otel.enabled false)) }}
 | 
			
		||||
            - name: OTEL_EXPORTER_OTLP_ENDPOINT
 | 
			
		||||
              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 }}
 | 
			
		||||
            {{- if $context.Values.mastodon.metrics.prometheus.enabled }}
 | 
			
		||||
            - name: MASTODON_PROMETHEUS_EXPORTER_ENABLED
 | 
			
		||||
              value: "true"
 | 
			
		||||
            - name: MASTODON_PROMETHEUS_EXPORTER_LOCAL
 | 
			
		||||
              value: "true"
 | 
			
		||||
            - name: MASTODON_PROMETHEUS_EXPORTER_HOST
 | 
			
		||||
              value: "0.0.0.0"
 | 
			
		||||
            - name: MASTODON_PROMETHEUS_EXPORTER_PORT
 | 
			
		||||
              value: "{{ $context.Values.mastodon.metrics.prometheus.port }}"
 | 
			
		||||
            {{- if $context.Values.mastodon.metrics.prometheus.sidekiq.detailed }}
 | 
			
		||||
            - name: MASTODON_PROMETHEUS_EXPORTER_SIDEKIQ_DETAILED_METRICS
 | 
			
		||||
              value: "true"
 | 
			
		||||
            {{- end }}
 | 
			
		||||
            {{- end }}
 | 
			
		||||
          {{- if $context.Values.mastodon.metrics.prometheus.enabled }}
 | 
			
		||||
          ports:
 | 
			
		||||
            - name: prometheus
 | 
			
		||||
              containerPort: {{ $context.Values.mastodon.metrics.prometheus.port }}
 | 
			
		||||
          {{- end }}
 | 
			
		||||
          volumeMounts:
 | 
			
		||||
          {{- if (not $context.Values.mastodon.s3.enabled) }}
 | 
			
		||||
            - name: assets
 | 
			
		||||
@@ -200,12 +257,24 @@ spec:
 | 
			
		||||
          {{- with $context.Values.volumeMounts }}
 | 
			
		||||
            {{- toYaml . | nindent 12 }}
 | 
			
		||||
          {{- end }}
 | 
			
		||||
          {{- if $context.Values.mastodon.sidekiq.readinessProbe.enabled }}
 | 
			
		||||
          readinessProbe:
 | 
			
		||||
            failureThreshold: {{ default 10 $context.Values.mastodon.sidekiq.readinessProbe.failureThreshold }}
 | 
			
		||||
            exec:
 | 
			
		||||
              command:
 | 
			
		||||
              - cat
 | 
			
		||||
              - {{ required "A valid sidekiq readiness path is required." $context.Values.mastodon.sidekiq.readinessProbe.path }}
 | 
			
		||||
            initialDelaySeconds: {{ default 10 $context.Values.mastodon.sidekiq.readinessProbe.initialDelaySeconds }}
 | 
			
		||||
            periodSeconds: {{ default 2 $context.Values.mastodon.sidekiq.readinessProbe.periodSeconds }}
 | 
			
		||||
            successThreshold: {{ default 1 $context.Values.mastodon.sidekiq.readinessProbe.successThreshold }}
 | 
			
		||||
            timeoutSeconds: {{ default 1 $context.Values.mastodon.sidekiq.readinessProbe.timeoutSeconds }}
 | 
			
		||||
          {{- end }}
 | 
			
		||||
          resources:
 | 
			
		||||
            {{- toYaml (default (default $context.Values.resources $context.Values.mastodon.sidekiq.resources) .resources) | nindent 12 }}
 | 
			
		||||
      {{- include "mastodon.statsdExporterContainer" $ | indent 8 }}
 | 
			
		||||
      {{- with $context.Values.nodeSelector }}
 | 
			
		||||
      {{- with coalesce .nodeSelector $context.Values.mastodon.sidekiq.nodeSelector $context.Values.nodeSelector }}
 | 
			
		||||
      nodeSelector:
 | 
			
		||||
        {{- toYaml . | nindent 8 }}
 | 
			
		||||
        {{- . | toYaml | nindent 8 }}
 | 
			
		||||
      {{- end }}
 | 
			
		||||
      {{- with $context.Values.tolerations }}
 | 
			
		||||
      tolerations:
 | 
			
		||||
 
 | 
			
		||||
@@ -4,8 +4,14 @@ metadata:
 | 
			
		||||
  name: {{ include "mastodon.fullname" . }}-streaming
 | 
			
		||||
  labels:
 | 
			
		||||
    {{- include "mastodon.labels" . | nindent 4 }}
 | 
			
		||||
    {{- with .Values.mastodon.streaming.labels }}
 | 
			
		||||
    {{- toYaml . | nindent 4 }}
 | 
			
		||||
    {{- end }}
 | 
			
		||||
  annotations:
 | 
			
		||||
    {{- with (default .Values.deploymentAnnotations .Values.mastodon.streaming.deploymentAnnotations) }}
 | 
			
		||||
    {{- with .Values.deploymentAnnotations }}
 | 
			
		||||
    {{- toYaml . | nindent 4 }}
 | 
			
		||||
    {{- end }}
 | 
			
		||||
    {{- with .Values.mastodon.streaming.annotations }}
 | 
			
		||||
    {{- toYaml . | nindent 4 }}
 | 
			
		||||
    {{- end }}
 | 
			
		||||
spec:
 | 
			
		||||
@@ -13,6 +19,9 @@ spec:
 | 
			
		||||
  {{- if (ne (toString .Values.mastodon.revisionHistoryLimit) "<nil>") }}
 | 
			
		||||
  revisionHistoryLimit: {{ .Values.mastodon.revisionHistoryLimit }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- if .Values.mastodon.streaming.updateStrategy }}
 | 
			
		||||
  strategy: {{- toYaml .Values.mastodon.streaming.updateStrategy | nindent 4 }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  selector:
 | 
			
		||||
    matchLabels:
 | 
			
		||||
      {{- include "mastodon.selectorLabels" . | nindent 6 }}
 | 
			
		||||
@@ -20,7 +29,10 @@ spec:
 | 
			
		||||
  template:
 | 
			
		||||
    metadata:
 | 
			
		||||
      annotations:
 | 
			
		||||
        {{- with (default .Values.podAnnotations .Values.mastodon.streaming.podAnnotations) }}
 | 
			
		||||
        {{- with .Values.podAnnotations }}
 | 
			
		||||
        {{- toYaml . | nindent 8 }}
 | 
			
		||||
        {{- end }}
 | 
			
		||||
        {{- with .Values.mastodon.streaming.podAnnotations }}
 | 
			
		||||
        {{- toYaml . | nindent 8 }}
 | 
			
		||||
        {{- end }}
 | 
			
		||||
        # roll the pods to pick up any db migrations or other changes
 | 
			
		||||
@@ -28,6 +40,12 @@ spec:
 | 
			
		||||
      labels:
 | 
			
		||||
        {{- include "mastodon.globalLabels" . | nindent 8 }}
 | 
			
		||||
        {{- include "mastodon.selectorLabels" . | nindent 8 }}
 | 
			
		||||
        {{- with .Values.mastodon.podLabels }}
 | 
			
		||||
        {{- toYaml . | nindent 8 }}
 | 
			
		||||
        {{- end }}
 | 
			
		||||
        {{- with .Values.mastodon.streaming.podLabels }}
 | 
			
		||||
        {{- toYaml . | nindent 8 }}
 | 
			
		||||
        {{- end }}
 | 
			
		||||
        app.kubernetes.io/component: streaming
 | 
			
		||||
    spec:
 | 
			
		||||
      {{- with .Values.imagePullSecrets }}
 | 
			
		||||
@@ -55,7 +73,7 @@ spec:
 | 
			
		||||
          securityContext:
 | 
			
		||||
            {{- toYaml . | nindent 12 }}
 | 
			
		||||
          {{- end }}
 | 
			
		||||
          image: "{{ coalesce .Values.mastodon.streaming.image.repository .Values.image.repository }}:{{ coalesce .Values.mastodon.streaming.image.tag .Values.image.tag .Chart.AppVersion }}"
 | 
			
		||||
          image: "{{ .Values.mastodon.streaming.image.repository }}:{{ coalesce .Values.mastodon.streaming.image.tag .Values.image.tag .Chart.AppVersion }}"
 | 
			
		||||
          imagePullPolicy: {{ .Values.image.pullPolicy }}
 | 
			
		||||
          command:
 | 
			
		||||
            - node
 | 
			
		||||
@@ -135,13 +153,20 @@ spec:
 | 
			
		||||
            httpGet:
 | 
			
		||||
              path: /api/v1/streaming/health
 | 
			
		||||
              port: streaming
 | 
			
		||||
          startupProbe:
 | 
			
		||||
            httpGet:
 | 
			
		||||
              path: /api/v1/streaming/health
 | 
			
		||||
              port: streaming
 | 
			
		||||
            initialDelaySeconds: 5
 | 
			
		||||
            failureThreshold: 15
 | 
			
		||||
            periodSeconds: 5
 | 
			
		||||
          {{- with (default .Values.resources .Values.mastodon.streaming.resources) }}
 | 
			
		||||
          resources:
 | 
			
		||||
            {{- toYaml . | nindent 12 }}
 | 
			
		||||
          {{- end }}
 | 
			
		||||
      {{- with .Values.nodeSelector }}
 | 
			
		||||
      {{- with coalesce .Values.mastodon.streaming.nodeSelector .Values.nodeSelector }}
 | 
			
		||||
      nodeSelector:
 | 
			
		||||
        {{- toYaml . | nindent 8 }}
 | 
			
		||||
        {{- . | toYaml | nindent 8 }}
 | 
			
		||||
      {{- end }}
 | 
			
		||||
      {{- with (default .Values.affinity .Values.mastodon.streaming.affinity) }}
 | 
			
		||||
      affinity:
 | 
			
		||||
 
 | 
			
		||||
@@ -4,8 +4,14 @@ metadata:
 | 
			
		||||
  name: {{ include "mastodon.fullname" . }}-web
 | 
			
		||||
  labels:
 | 
			
		||||
    {{- include "mastodon.labels" . | nindent 4 }}
 | 
			
		||||
    {{- with .Values.mastodon.web.labels }}
 | 
			
		||||
    {{- toYaml . | nindent 4 }}
 | 
			
		||||
    {{- end }}
 | 
			
		||||
  annotations:
 | 
			
		||||
    {{- with (default .Values.deploymentAnnotations .Values.mastodon.web.deploymentAnnotations) }}
 | 
			
		||||
    {{- with .Values.deploymentAnnotations }}
 | 
			
		||||
    {{- toYaml . | nindent 4 }}
 | 
			
		||||
    {{- end }}
 | 
			
		||||
    {{- with .Values.mastodon.web.annotations }}
 | 
			
		||||
    {{- toYaml . | nindent 4 }}
 | 
			
		||||
    {{- end }}
 | 
			
		||||
spec:
 | 
			
		||||
@@ -13,6 +19,9 @@ spec:
 | 
			
		||||
  {{- if (ne (toString .Values.mastodon.revisionHistoryLimit) "<nil>") }}
 | 
			
		||||
  revisionHistoryLimit: {{ .Values.mastodon.revisionHistoryLimit }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- if .Values.mastodon.web.updateStrategy }}
 | 
			
		||||
  strategy: {{- toYaml .Values.mastodon.web.updateStrategy | nindent 4 }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  selector:
 | 
			
		||||
    matchLabels:
 | 
			
		||||
      {{- include "mastodon.selectorLabels" . | nindent 6 }}
 | 
			
		||||
@@ -21,7 +30,10 @@ spec:
 | 
			
		||||
  template:
 | 
			
		||||
    metadata:
 | 
			
		||||
      annotations:
 | 
			
		||||
        {{- with (default .Values.podAnnotations .Values.mastodon.web.podAnnotations) }}
 | 
			
		||||
        {{- with .Values.podAnnotations }}
 | 
			
		||||
        {{- toYaml . | nindent 8 }}
 | 
			
		||||
        {{- end }}
 | 
			
		||||
        {{- with .Values.mastodon.web.podAnnotations }}
 | 
			
		||||
        {{- toYaml . | nindent 8 }}
 | 
			
		||||
        {{- end }}
 | 
			
		||||
        # roll the pods to pick up any db migrations or other changes
 | 
			
		||||
@@ -30,6 +42,12 @@ spec:
 | 
			
		||||
        {{- include "mastodon.globalLabels" . | nindent 8 }}
 | 
			
		||||
        {{- include "mastodon.selectorLabels" . | nindent 8 }}
 | 
			
		||||
        {{- include "mastodon.statsdExporterLabels" . | nindent 8 }}
 | 
			
		||||
        {{- with .Values.mastodon.podLabels }}
 | 
			
		||||
        {{- toYaml . | nindent 8 }}
 | 
			
		||||
        {{- end }}
 | 
			
		||||
        {{- with .Values.mastodon.web.podLabels }}
 | 
			
		||||
        {{- toYaml . | nindent 8 }}
 | 
			
		||||
        {{- end }}
 | 
			
		||||
        app.kubernetes.io/component: web
 | 
			
		||||
        app.kubernetes.io/part-of: rails
 | 
			
		||||
    spec:
 | 
			
		||||
@@ -173,6 +191,28 @@ spec:
 | 
			
		||||
                  name: {{ .Values.mastodon.cacheBuster.authToken.existingSecret }}
 | 
			
		||||
                  key: password
 | 
			
		||||
            {{- end }}
 | 
			
		||||
            {{- if or .Values.mastodon.web.otel.enabled (and .Values.mastodon.otel.enabled (ne .Values.mastodon.web.otel.enabled false)) }}
 | 
			
		||||
            - name: OTEL_EXPORTER_OTLP_ENDPOINT
 | 
			
		||||
              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 }}
 | 
			
		||||
            {{- if .Values.mastodon.metrics.prometheus.enabled }}
 | 
			
		||||
            - name: MASTODON_PROMETHEUS_EXPORTER_ENABLED
 | 
			
		||||
              value: "true"
 | 
			
		||||
            - name: PROMETHEUS_EXPORTER_HOST
 | 
			
		||||
              value: "127.0.0.1"
 | 
			
		||||
            - name: PROMETHEUS_EXPORTER_PORT
 | 
			
		||||
              value: "{{ .Values.mastodon.metrics.prometheus.port }}"
 | 
			
		||||
            {{- if .Values.mastodon.metrics.prometheus.web.detailed }}
 | 
			
		||||
            - name: MASTODON_PROMETHEUS_EXPORTER_WEB_DETAILED_METRICS
 | 
			
		||||
              value: "true"
 | 
			
		||||
            {{- end }}
 | 
			
		||||
            {{- end }}
 | 
			
		||||
            - name: TEST_ENV_VALUE
 | 
			
		||||
              value: {{ .Values.mastodon.metrics.statsd.address }}
 | 
			
		||||
          volumeMounts:
 | 
			
		||||
          {{- if (not .Values.mastodon.s3.enabled) }}
 | 
			
		||||
            - name: assets
 | 
			
		||||
@@ -203,16 +243,38 @@ spec:
 | 
			
		||||
            httpGet:
 | 
			
		||||
              path: /health
 | 
			
		||||
              port: http
 | 
			
		||||
            initialDelaySeconds: 15
 | 
			
		||||
            failureThreshold: 30
 | 
			
		||||
            periodSeconds: 5
 | 
			
		||||
          {{- with (default .Values.resources .Values.mastodon.web.resources) }}
 | 
			
		||||
          resources:
 | 
			
		||||
            {{- toYaml . | nindent 12 }}
 | 
			
		||||
          {{- end }}
 | 
			
		||||
        {{- if .Values.mastodon.metrics.prometheus.enabled }}
 | 
			
		||||
        - name: prometheus-exporter
 | 
			
		||||
          image: "{{ coalesce .Values.mastodon.web.image.repository .Values.image.repository }}:{{ coalesce .Values.mastodon.web.image.tag .Values.image.tag .Chart.AppVersion }}"
 | 
			
		||||
          command:
 | 
			
		||||
            - ./bin/prometheus_exporter
 | 
			
		||||
          args:
 | 
			
		||||
            - "--bind"
 | 
			
		||||
            - "0.0.0.0"
 | 
			
		||||
            - "--port"
 | 
			
		||||
            - "{{ .Values.mastodon.metrics.prometheus.port }}"
 | 
			
		||||
          resources:
 | 
			
		||||
            requests:
 | 
			
		||||
              cpu: "0.1"
 | 
			
		||||
              memory: "180M"
 | 
			
		||||
            limits:
 | 
			
		||||
              cpu: "0.5"
 | 
			
		||||
              memory: "250M"
 | 
			
		||||
          ports:
 | 
			
		||||
            - name: prometheus
 | 
			
		||||
              containerPort: {{ .Values.mastodon.metrics.prometheus.port }}
 | 
			
		||||
        {{- end }}
 | 
			
		||||
        {{- include "mastodon.statsdExporterContainer" $ | indent 8 }}
 | 
			
		||||
      {{- with .Values.nodeSelector }}
 | 
			
		||||
      {{- with coalesce .Values.mastodon.web.nodeSelector .Values.nodeSelector }}
 | 
			
		||||
      nodeSelector:
 | 
			
		||||
        {{- toYaml . | nindent 8 }}
 | 
			
		||||
        {{- . | toYaml | nindent 8 }}
 | 
			
		||||
      {{- end }}
 | 
			
		||||
      {{- with (default .Values.affinity .Values.mastodon.web.affinity) }}
 | 
			
		||||
      affinity:
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										97
									
								
								mastodon/templates/job-assets-copy.yaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										97
									
								
								mastodon/templates/job-assets-copy.yaml
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,97 @@
 | 
			
		||||
{{- if .Values.mastodon.hooks.s3Upload.enabled -}}
 | 
			
		||||
apiVersion: batch/v1
 | 
			
		||||
kind: Job
 | 
			
		||||
metadata:
 | 
			
		||||
  name: {{ include "mastodon.fullname" . }}-assets-upload
 | 
			
		||||
  labels:
 | 
			
		||||
    {{- include "mastodon.labels" . | nindent 4 }}
 | 
			
		||||
  annotations:
 | 
			
		||||
    "helm.sh/hook": pre-install,pre-upgrade
 | 
			
		||||
    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
 | 
			
		||||
    "helm.sh/hook-weight": "-1"
 | 
			
		||||
spec:
 | 
			
		||||
  template:
 | 
			
		||||
    metadata:
 | 
			
		||||
      name: {{ include "mastodon.fullname" . }}-assets-upload
 | 
			
		||||
      {{- with .Values.jobAnnotations }}
 | 
			
		||||
      annotations:
 | 
			
		||||
        {{- toYaml . | nindent 8 }}
 | 
			
		||||
      {{- end }}
 | 
			
		||||
    spec:
 | 
			
		||||
      {{- with .Values.imagePullSecrets }}
 | 
			
		||||
      imagePullSecrets:
 | 
			
		||||
        {{- toYaml . | nindent 8 }}
 | 
			
		||||
      {{- end }}
 | 
			
		||||
      volumes:
 | 
			
		||||
      restartPolicy: Never
 | 
			
		||||
      initContainers:
 | 
			
		||||
        - name: extract-assets
 | 
			
		||||
          image: "{{ coalesce .Values.mastodon.web.image.repository .Values.image.repository }}:{{ coalesce .Values.mastodon.web.image.tag .Values.image.tag .Chart.AppVersion }}"
 | 
			
		||||
          imagePullPolicy: Always
 | 
			
		||||
          command:
 | 
			
		||||
          - cp
 | 
			
		||||
          args:
 | 
			
		||||
          - -rv
 | 
			
		||||
          - public
 | 
			
		||||
          - /assets
 | 
			
		||||
          volumeMounts:
 | 
			
		||||
            - mountPath: /assets
 | 
			
		||||
              name: assets
 | 
			
		||||
      containers:
 | 
			
		||||
        - name: upload-assets
 | 
			
		||||
          image: rclone/rclone:1
 | 
			
		||||
          imagePullPolicy: Always
 | 
			
		||||
          env:
 | 
			
		||||
          - name: RCLONE_S3_NO_CHECK_BUCKET
 | 
			
		||||
            value: "true"
 | 
			
		||||
          - name: RCLONE_S3_ACL
 | 
			
		||||
            value: {{ required "Please specify a canned ACL for S3 asset uploads" .Values.mastodon.hooks.s3Upload.acl }}
 | 
			
		||||
          - name: RCLONE_CONFIG_REMOTE_TYPE
 | 
			
		||||
            value: s3
 | 
			
		||||
          - name: RCLONE_CONFIG_REMOTE_PROVIDER
 | 
			
		||||
            value: AWS
 | 
			
		||||
          - name: RCLONE_CONFIG_REMOTE_ENDPOINT
 | 
			
		||||
            value: {{ required "Please specify an endpoint for S3 asset uploads" .Values.mastodon.hooks.s3Upload.endpoint }}
 | 
			
		||||
          - name: RCLONE_CONFIG_REMOTE_ACCESS_KEY_ID
 | 
			
		||||
            valueFrom:
 | 
			
		||||
              secretKeyRef:
 | 
			
		||||
                name: {{ required "Please specify a secret with S3 credentials for S3 asset uploads" .Values.mastodon.hooks.s3Upload.secretRef.name }}
 | 
			
		||||
                key: {{ .Values.mastodon.hooks.s3Upload.secretRef.keys.accesKeyId }}
 | 
			
		||||
          - name: RCLONE_CONFIG_REMOTE_SECRET_ACCESS_KEY
 | 
			
		||||
            valueFrom:
 | 
			
		||||
              secretKeyRef:
 | 
			
		||||
                name: {{ required "Please specify a secret with S3 credentials for S3 asset uploads" .Values.mastodon.hooks.s3Upload.secretRef.name }}
 | 
			
		||||
                key: {{ .Values.mastodon.hooks.s3Upload.secretRef.keys.secretAccessKey }}
 | 
			
		||||
          {{- with .Values.mastodon.hooks.s3Upload.rclone.env }}
 | 
			
		||||
            {{- toYaml . | nindent 12 }}
 | 
			
		||||
          {{- end }}
 | 
			
		||||
          command:
 | 
			
		||||
          - rclone
 | 
			
		||||
          args:
 | 
			
		||||
          - copy
 | 
			
		||||
          - /assets/public
 | 
			
		||||
          - "remote:{{ required "Please specify a bucket for S3 asset uploads" .Values.mastodon.hooks.s3Upload.bucket }}"
 | 
			
		||||
          - --fast-list
 | 
			
		||||
          - --transfers=32
 | 
			
		||||
          - --include
 | 
			
		||||
          - "{assets,packs}/**"
 | 
			
		||||
          - --progress
 | 
			
		||||
          - -vv
 | 
			
		||||
          volumeMounts:
 | 
			
		||||
            - mountPath: /assets
 | 
			
		||||
              name: assets
 | 
			
		||||
          resources:
 | 
			
		||||
            requests:
 | 
			
		||||
              cpu: 100m
 | 
			
		||||
              memory: 256Mi
 | 
			
		||||
            limits:
 | 
			
		||||
              memory: 500Mi
 | 
			
		||||
      volumes:
 | 
			
		||||
        - name: assets
 | 
			
		||||
          emptyDir: {}
 | 
			
		||||
      {{- with coalesce .Values.mastodon.hooks.s3Upload.nodeSelector .Values.nodeSelector }}
 | 
			
		||||
      nodeSelector:
 | 
			
		||||
        {{- . | toYaml | nindent 8 }}
 | 
			
		||||
      {{- end }}
 | 
			
		||||
 | 
			
		||||
{{- end -}}
 | 
			
		||||
@@ -1,100 +0,0 @@
 | 
			
		||||
{{- if .Values.elasticsearch.enabled -}}
 | 
			
		||||
apiVersion: batch/v1
 | 
			
		||||
kind: Job
 | 
			
		||||
metadata:
 | 
			
		||||
  name: {{ include "mastodon.fullname" . }}-chewy-upgrade
 | 
			
		||||
  labels:
 | 
			
		||||
    {{- include "mastodon.labels" . | nindent 4 }}
 | 
			
		||||
  annotations:
 | 
			
		||||
    "helm.sh/hook": post-install
 | 
			
		||||
    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
 | 
			
		||||
    "helm.sh/hook-weight": "-1"
 | 
			
		||||
spec:
 | 
			
		||||
  template:
 | 
			
		||||
    metadata:
 | 
			
		||||
      name: {{ include "mastodon.fullname" . }}-chewy-upgrade
 | 
			
		||||
      {{- with .Values.jobAnnotations }}
 | 
			
		||||
      annotations:
 | 
			
		||||
        {{- toYaml . | nindent 8 }}
 | 
			
		||||
      {{- end }}
 | 
			
		||||
    spec:
 | 
			
		||||
      restartPolicy: Never
 | 
			
		||||
      {{- if (not .Values.mastodon.s3.enabled) }}
 | 
			
		||||
      # 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.mastodon.persistence.assets.accessMode) (eq "ReadWriteOnce" .Values.mastodon.persistence.system.accessMode) }}
 | 
			
		||||
      affinity:
 | 
			
		||||
        podAffinity:
 | 
			
		||||
          requiredDuringSchedulingIgnoredDuringExecution:
 | 
			
		||||
            - labelSelector:
 | 
			
		||||
                matchExpressions:
 | 
			
		||||
                  - key: app.kubernetes.io/part-of
 | 
			
		||||
                    operator: In
 | 
			
		||||
                    values:
 | 
			
		||||
                      - rails
 | 
			
		||||
              topologyKey: kubernetes.io/hostname
 | 
			
		||||
      {{- end }}
 | 
			
		||||
      volumes:
 | 
			
		||||
        - name: assets
 | 
			
		||||
          persistentVolumeClaim:
 | 
			
		||||
            claimName: {{ template "mastodon.pvc.assets" . }}
 | 
			
		||||
        - name: system
 | 
			
		||||
          persistentVolumeClaim:
 | 
			
		||||
            claimName: {{ template "mastodon.pvc.system" . }}
 | 
			
		||||
      {{- end }}
 | 
			
		||||
      containers:
 | 
			
		||||
        - name: {{ include "mastodon.fullname" . }}-chewy-setup
 | 
			
		||||
          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
 | 
			
		||||
          imagePullPolicy: {{ .Values.image.pullPolicy }}
 | 
			
		||||
          command:
 | 
			
		||||
            - bundle
 | 
			
		||||
            - exec
 | 
			
		||||
            - rake
 | 
			
		||||
            - chewy:upgrade
 | 
			
		||||
          envFrom:
 | 
			
		||||
            - configMapRef:
 | 
			
		||||
                name: {{ include "mastodon.fullname" . }}-env
 | 
			
		||||
            - secretRef:
 | 
			
		||||
                name: {{ template "mastodon.secretName" . }}
 | 
			
		||||
          env:
 | 
			
		||||
            - name: "DB_PASS"
 | 
			
		||||
              valueFrom:
 | 
			
		||||
                secretKeyRef:
 | 
			
		||||
                  name: {{ template "mastodon.postgresql.secretName" . }}
 | 
			
		||||
                  key: password
 | 
			
		||||
            - name: "REDIS_PASSWORD"
 | 
			
		||||
              valueFrom:
 | 
			
		||||
                secretKeyRef:
 | 
			
		||||
                  name: {{ template "mastodon.redis.secretName" . }}
 | 
			
		||||
                  key: redis-password
 | 
			
		||||
            {{- if and .Values.redis.sidekiq.enabled .Values.redis.sidekiq.auth.existingSecret }}
 | 
			
		||||
            - name: "SIDEKIQ_REDIS_PASSWORD"
 | 
			
		||||
              valueFrom:
 | 
			
		||||
                secretKeyRef:
 | 
			
		||||
                  name: {{ template "mastodon.redis.sidekiq.secretName" . }}
 | 
			
		||||
                  key: redis-password
 | 
			
		||||
            {{- end }}
 | 
			
		||||
            {{- if and .Values.redis.cache.enabled .Values.redis.cache.auth.existingSecret }}
 | 
			
		||||
            - name: "CACHE_REDIS_PASSWORD"
 | 
			
		||||
              valueFrom:
 | 
			
		||||
                secretKeyRef:
 | 
			
		||||
                  name: {{ template "mastodon.redis.cache.secretName" . }}
 | 
			
		||||
                  key: redis-password
 | 
			
		||||
            {{- end }}
 | 
			
		||||
            {{- if and .Values.elasticsearch.existingSecret (or .Values.elasticsearch.enabled .Values.elasticsearch.hostname) }}
 | 
			
		||||
            - name: "ES_PASS"
 | 
			
		||||
              valueFrom:
 | 
			
		||||
                secretKeyRef:
 | 
			
		||||
                  name: {{ .Values.elasticsearch.existingSecret }}
 | 
			
		||||
                  key: password
 | 
			
		||||
            {{- end }}
 | 
			
		||||
            - name: "PORT"
 | 
			
		||||
              value: {{ .Values.mastodon.web.port | quote }}
 | 
			
		||||
          {{- if (not .Values.mastodon.s3.enabled) }}
 | 
			
		||||
          volumeMounts:
 | 
			
		||||
            - name: assets
 | 
			
		||||
              mountPath: /opt/mastodon/public/assets
 | 
			
		||||
            - name: system
 | 
			
		||||
              mountPath: /opt/mastodon/public/system
 | 
			
		||||
          {{- end }}
 | 
			
		||||
{{- end }}
 | 
			
		||||
@@ -95,4 +95,8 @@ spec:
 | 
			
		||||
            - name: system
 | 
			
		||||
              mountPath: /opt/mastodon/public/system
 | 
			
		||||
          {{- end }}
 | 
			
		||||
      {{- with coalesce .Values.mastodon.createAdmin.nodeSelector .Values.nodeSelector }}
 | 
			
		||||
      nodeSelector:
 | 
			
		||||
        {{- . | toYaml | nindent 8 }}
 | 
			
		||||
      {{- end }}
 | 
			
		||||
{{- end }}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,93 +1,7 @@
 | 
			
		||||
{{- if .Values.mastodon.hooks.dbMigrate.enabled -}}
 | 
			
		||||
apiVersion: batch/v1
 | 
			
		||||
kind: Job
 | 
			
		||||
metadata:
 | 
			
		||||
  name: {{ include "mastodon.fullname" . }}-db-migrate
 | 
			
		||||
  labels:
 | 
			
		||||
    {{- include "mastodon.labels" . | nindent 4 }}
 | 
			
		||||
  annotations:
 | 
			
		||||
    "helm.sh/hook": post-install,pre-upgrade
 | 
			
		||||
    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
 | 
			
		||||
    "helm.sh/hook-weight": "-2"
 | 
			
		||||
spec:
 | 
			
		||||
  template:
 | 
			
		||||
    metadata:
 | 
			
		||||
      name: {{ include "mastodon.fullname" . }}-db-migrate
 | 
			
		||||
      {{- with .Values.jobAnnotations }}
 | 
			
		||||
      annotations:
 | 
			
		||||
        {{- toYaml . | nindent 8 }}
 | 
			
		||||
{{- if .Values.mastodon.hooks.dbMigrate.enabled }}
 | 
			
		||||
{{- include "mastodon.dbMigrateJob" (merge (dict "preDeploy" false ) .) }}
 | 
			
		||||
      {{- with coalesce .Values.mastodon.hooks.dbMigrate.nodeSelector .Values.nodeSelector }}
 | 
			
		||||
      nodeSelector:
 | 
			
		||||
        {{- . | toYaml | nindent 8 }}
 | 
			
		||||
      {{- end }}
 | 
			
		||||
    spec:
 | 
			
		||||
      restartPolicy: Never
 | 
			
		||||
      {{- if (not .Values.mastodon.s3.enabled) }}
 | 
			
		||||
      # 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.mastodon.persistence.assets.accessMode) (eq "ReadWriteOnce" .Values.mastodon.persistence.system.accessMode) }}
 | 
			
		||||
      affinity:
 | 
			
		||||
        podAffinity:
 | 
			
		||||
          requiredDuringSchedulingIgnoredDuringExecution:
 | 
			
		||||
            - labelSelector:
 | 
			
		||||
                matchExpressions:
 | 
			
		||||
                  - key: app.kubernetes.io/part-of
 | 
			
		||||
                    operator: In
 | 
			
		||||
                    values:
 | 
			
		||||
                      - rails
 | 
			
		||||
              topologyKey: kubernetes.io/hostname
 | 
			
		||||
      {{- end }}
 | 
			
		||||
      volumes:
 | 
			
		||||
        - name: assets
 | 
			
		||||
          persistentVolumeClaim:
 | 
			
		||||
            claimName: {{ template "mastodon.pvc.assets" . }}
 | 
			
		||||
        - name: system
 | 
			
		||||
          persistentVolumeClaim:
 | 
			
		||||
            claimName: {{ template "mastodon.pvc.system" . }}
 | 
			
		||||
      {{- end }}
 | 
			
		||||
      containers:
 | 
			
		||||
        - name: {{ include "mastodon.fullname" . }}-db-migrate
 | 
			
		||||
          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
 | 
			
		||||
          imagePullPolicy: {{ .Values.image.pullPolicy }}
 | 
			
		||||
          command:
 | 
			
		||||
            - bundle
 | 
			
		||||
            - exec
 | 
			
		||||
            - rake
 | 
			
		||||
            - db:migrate
 | 
			
		||||
          envFrom:
 | 
			
		||||
            - configMapRef:
 | 
			
		||||
                name: {{ include "mastodon.fullname" . }}-env
 | 
			
		||||
            - secretRef:
 | 
			
		||||
                name: {{ template "mastodon.secretName" . }}
 | 
			
		||||
          env:
 | 
			
		||||
            - name: "DB_PASS"
 | 
			
		||||
              valueFrom:
 | 
			
		||||
                secretKeyRef:
 | 
			
		||||
                  name: {{ template "mastodon.postgresql.secretName" . }}
 | 
			
		||||
                  key: password
 | 
			
		||||
            - name: "REDIS_PASSWORD"
 | 
			
		||||
              valueFrom:
 | 
			
		||||
                secretKeyRef:
 | 
			
		||||
                  name: {{ template "mastodon.redis.secretName" . }}
 | 
			
		||||
                  key: redis-password
 | 
			
		||||
            {{- if and .Values.redis.sidekiq.enabled .Values.redis.sidekiq.auth.existingSecret }}
 | 
			
		||||
            - name: "SIDEKIQ_REDIS_PASSWORD"
 | 
			
		||||
              valueFrom:
 | 
			
		||||
                secretKeyRef:
 | 
			
		||||
                  name: {{ template "mastodon.redis.sidekiq.secretName" . }}
 | 
			
		||||
                  key: redis-password
 | 
			
		||||
            {{- end }}
 | 
			
		||||
            {{- if and .Values.redis.cache.enabled .Values.redis.cache.auth.existingSecret }}
 | 
			
		||||
            - name: "CACHE_REDIS_PASSWORD"
 | 
			
		||||
              valueFrom:
 | 
			
		||||
                secretKeyRef:
 | 
			
		||||
                  name: {{ template "mastodon.redis.cache.secretName" . }}
 | 
			
		||||
                  key: redis-password
 | 
			
		||||
            {{- end }}
 | 
			
		||||
            - name: "PORT"
 | 
			
		||||
              value: {{ .Values.mastodon.web.port | quote }}
 | 
			
		||||
          {{- if (not .Values.mastodon.s3.enabled) }}
 | 
			
		||||
          volumeMounts:
 | 
			
		||||
            - name: assets
 | 
			
		||||
              mountPath: /opt/mastodon/public/assets
 | 
			
		||||
            - name: system
 | 
			
		||||
              mountPath: /opt/mastodon/public/system
 | 
			
		||||
          {{- end }}
 | 
			
		||||
{{- end -}}
 | 
			
		||||
{{- end }}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										7
									
								
								mastodon/templates/job-db-pre-migrate.yaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								mastodon/templates/job-db-pre-migrate.yaml
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,7 @@
 | 
			
		||||
{{- if .Values.mastodon.hooks.dbMigrate.enabled }}
 | 
			
		||||
{{- include "mastodon.dbMigrateJob" (merge (dict "preDeploy" true ) .) }}
 | 
			
		||||
      {{- with coalesce .Values.mastodon.hooks.dbMigrate.nodeSelector .Values.nodeSelector }}
 | 
			
		||||
      nodeSelector:
 | 
			
		||||
        {{- . | toYaml | nindent 8 }}
 | 
			
		||||
      {{- end }}
 | 
			
		||||
{{- end }}
 | 
			
		||||
							
								
								
									
										7
									
								
								mastodon/templates/job-db-prepare.yaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								mastodon/templates/job-db-prepare.yaml
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,7 @@
 | 
			
		||||
{{- if and .Values.mastodon.hooks.dbPrepare.enabled (not .Values.postgresql.enabled) }}
 | 
			
		||||
{{- include "mastodon.dbMigrateJob" (merge (dict "prepare" true ) .) }}
 | 
			
		||||
      {{- with coalesce .Values.mastodon.hooks.dbPrepare.nodeSelector .Values.nodeSelector }}
 | 
			
		||||
      nodeSelector:
 | 
			
		||||
        {{- . | toYaml | nindent 8 }}
 | 
			
		||||
      {{- end }}
 | 
			
		||||
{{- end }}
 | 
			
		||||
@@ -1,18 +1,19 @@
 | 
			
		||||
{{- if .Values.mastodon.hooks.assetsPrecompile.enabled -}}
 | 
			
		||||
{{- if and .Values.mastodon.hooks.deploySearch.enabled .Values.elasticsearch.enabled -}}
 | 
			
		||||
apiVersion: batch/v1
 | 
			
		||||
kind: Job
 | 
			
		||||
metadata:
 | 
			
		||||
  name: {{ include "mastodon.fullname" . }}-assets-precompile
 | 
			
		||||
  name: {{ include "mastodon.fullname" . }}-deploy-search
 | 
			
		||||
  labels:
 | 
			
		||||
    {{- include "mastodon.labels" . | nindent 4 }}
 | 
			
		||||
  annotations:
 | 
			
		||||
    "helm.sh/hook": post-install
 | 
			
		||||
    "helm.sh/hook": post-install,post-upgrade
 | 
			
		||||
    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
 | 
			
		||||
    "helm.sh/hook-weight": "-2"
 | 
			
		||||
spec:
 | 
			
		||||
  suspend: false
 | 
			
		||||
  template:
 | 
			
		||||
    metadata:
 | 
			
		||||
      name: {{ include "mastodon.fullname" . }}-assets-precompile
 | 
			
		||||
      name: {{ include "mastodon.fullname" . }}-deploy-search
 | 
			
		||||
      {{- with .Values.jobAnnotations }}
 | 
			
		||||
      annotations:
 | 
			
		||||
        {{- toYaml . | nindent 8 }}
 | 
			
		||||
@@ -22,40 +23,63 @@ spec:
 | 
			
		||||
      {{- if (not .Values.mastodon.s3.enabled) }}
 | 
			
		||||
      # 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.mastodon.persistence.assets.accessMode) (eq "ReadWriteOnce" .Values.mastodon.persistence.system.accessMode) }}
 | 
			
		||||
      {{- if or (eq "ReadWriteOnce" .Values.mastodon.persistence.assets.accessMode) (eq "ReadWriteOnce" .Values.persistence.system.accessMode) }}
 | 
			
		||||
      affinity:
 | 
			
		||||
        podAffinity:
 | 
			
		||||
          requiredDuringSchedulingIgnoredDuringExecution:
 | 
			
		||||
            - labelSelector:
 | 
			
		||||
                matchExpressions:
 | 
			
		||||
                  - key: app.kubernetes.io/part-of
 | 
			
		||||
                    operator: In
 | 
			
		||||
                    values:
 | 
			
		||||
                      - rails
 | 
			
		||||
              topologyKey: kubernetes.io/hostname
 | 
			
		||||
          - labelSelector:
 | 
			
		||||
              matchExpressions:
 | 
			
		||||
                - key: app.kubernetes.io/part-of
 | 
			
		||||
                  operator: In
 | 
			
		||||
                  values:
 | 
			
		||||
                    - rails
 | 
			
		||||
            topologyKey: kubernetes.io/hostname
 | 
			
		||||
      {{- end }}
 | 
			
		||||
      volumes:
 | 
			
		||||
        - name: assets
 | 
			
		||||
          persistentVolumeClaim:
 | 
			
		||||
            claimName: {{ template "mastodon.pvc.assets" . }}
 | 
			
		||||
            claimName: {{ template "mastodon.fullname" . }}-assets
 | 
			
		||||
        - name: system
 | 
			
		||||
          persistentVolumeClaim:
 | 
			
		||||
            claimName: {{ template "mastodon.pvc.system" . }}
 | 
			
		||||
            claimName: {{ template "mastodon.fullname" . }}-system
 | 
			
		||||
      {{- end }}
 | 
			
		||||
      containers:
 | 
			
		||||
        - name: {{ include "mastodon.fullname" . }}-assets-precompile
 | 
			
		||||
        - name: {{ include "mastodon.fullname" . }}-deploy-search
 | 
			
		||||
          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
 | 
			
		||||
          imagePullPolicy: {{ .Values.image.pullPolicy }}
 | 
			
		||||
          {{- with .Values.mastodon.hooks.deploySearch }}
 | 
			
		||||
          {{- with .resources }}
 | 
			
		||||
          resources:
 | 
			
		||||
            {{- toYaml . | nindent 12 }}
 | 
			
		||||
          {{- end }}
 | 
			
		||||
          command:
 | 
			
		||||
            - bash
 | 
			
		||||
            - -c
 | 
			
		||||
            - |
 | 
			
		||||
                bundle exec rake assets:precompile && yarn cache clean
 | 
			
		||||
            - bin/tootctl
 | 
			
		||||
            - search
 | 
			
		||||
            - deploy
 | 
			
		||||
            {{- with .concurrency }}
 | 
			
		||||
            - '--concurrency'
 | 
			
		||||
            - {{ . | quote }}
 | 
			
		||||
            {{- end }}
 | 
			
		||||
            {{- if .resetChewy }}
 | 
			
		||||
            - '--reset-chewy'
 | 
			
		||||
            {{- end }}
 | 
			
		||||
            {{- with .batchSize }}
 | 
			
		||||
            - '--batch-size'
 | 
			
		||||
            - {{ . | quote }}
 | 
			
		||||
            {{- end }}
 | 
			
		||||
            {{- with .only }}
 | 
			
		||||
              {{- if not (has . (list "instances" "accounts" "tags" "statuses" "public_statuses")) -}}
 | 
			
		||||
                {{ fail "mastodon.hooks.deploySearch.only: Value must be one of the following words: instances, accounts, tags, statuses, public_statuses"}}
 | 
			
		||||
              {{- end }}
 | 
			
		||||
            - '--only'
 | 
			
		||||
            - {{ . | quote }}
 | 
			
		||||
            {{- end }}
 | 
			
		||||
          {{- end }}
 | 
			
		||||
          envFrom:
 | 
			
		||||
            - configMapRef:
 | 
			
		||||
                name: {{ include "mastodon.fullname" . }}-env
 | 
			
		||||
            - secretRef:
 | 
			
		||||
                name: {{ template "mastodon.secretName" . }}
 | 
			
		||||
                name: {{ template "mastodon.secretName" $ }}
 | 
			
		||||
          env:
 | 
			
		||||
            - name: "DB_PASS"
 | 
			
		||||
              valueFrom:
 | 
			
		||||
@@ -67,20 +91,6 @@ spec:
 | 
			
		||||
                secretKeyRef:
 | 
			
		||||
                  name: {{ template "mastodon.redis.secretName" . }}
 | 
			
		||||
                  key: redis-password
 | 
			
		||||
            {{- if and .Values.redis.sidekiq.enabled .Values.redis.sidekiq.auth.existingSecret }}
 | 
			
		||||
            - name: "SIDEKIQ_REDIS_PASSWORD"
 | 
			
		||||
              valueFrom:
 | 
			
		||||
                secretKeyRef:
 | 
			
		||||
                  name: {{ template "mastodon.redis.sidekiq.secretName" . }}
 | 
			
		||||
                  key: redis-password
 | 
			
		||||
            {{- end }}
 | 
			
		||||
            {{- if and .Values.redis.cache.enabled .Values.redis.cache.auth.existingSecret }}
 | 
			
		||||
            - name: "CACHE_REDIS_PASSWORD"
 | 
			
		||||
              valueFrom:
 | 
			
		||||
                secretKeyRef:
 | 
			
		||||
                  name: {{ template "mastodon.redis.cache.secretName" . }}
 | 
			
		||||
                  key: redis-password
 | 
			
		||||
            {{- end }}
 | 
			
		||||
            - name: "PORT"
 | 
			
		||||
              value: {{ .Values.mastodon.web.port | quote }}
 | 
			
		||||
          {{- if (not .Values.mastodon.s3.enabled) }}
 | 
			
		||||
@@ -90,4 +100,4 @@ spec:
 | 
			
		||||
            - name: system
 | 
			
		||||
              mountPath: /opt/mastodon/public/system
 | 
			
		||||
          {{- end }}
 | 
			
		||||
{{- end -}}
 | 
			
		||||
{{- end }}
 | 
			
		||||
@@ -37,10 +37,10 @@ spec:
 | 
			
		||||
      volumes:
 | 
			
		||||
        - name: assets
 | 
			
		||||
          persistentVolumeClaim:
 | 
			
		||||
            claimName: {{ template "mastodon.fullname" . }}-assets
 | 
			
		||||
            claimName: {{ template "mastodon.pvc.assets" . }}
 | 
			
		||||
        - name: system
 | 
			
		||||
          persistentVolumeClaim:
 | 
			
		||||
            claimName: {{ template "mastodon.fullname" . }}-system
 | 
			
		||||
            claimName: {{ template "mastodon.pvc.system" . }}
 | 
			
		||||
      {{- end }}
 | 
			
		||||
      containers:
 | 
			
		||||
        - name: {{ include "mastodon.fullname" . }}-set-admin-password
 | 
			
		||||
@@ -70,6 +70,20 @@ spec:
 | 
			
		||||
                secretKeyRef:
 | 
			
		||||
                  name: {{ template "mastodon.redis.secretName" . }}
 | 
			
		||||
                  key: redis-password
 | 
			
		||||
            {{- if and .Values.redis.sidekiq.enabled .Values.redis.sidekiq.auth.existingSecret }}
 | 
			
		||||
            - name: "SIDEKIQ_REDIS_PASSWORD"
 | 
			
		||||
              valueFrom:
 | 
			
		||||
                secretKeyRef:
 | 
			
		||||
                  name: {{ template "mastodon.redis.sidekiq.secretName" . }}
 | 
			
		||||
                  key: redis-password
 | 
			
		||||
            {{- end }}
 | 
			
		||||
            {{- if and .Values.redis.cache.enabled .Values.redis.cache.auth.existingSecret }}
 | 
			
		||||
            - name: "CACHE_REDIS_PASSWORD"
 | 
			
		||||
              valueFrom:
 | 
			
		||||
                secretKeyRef:
 | 
			
		||||
                  name: {{ template "mastodon.redis.cache.secretName" . }}
 | 
			
		||||
                  key: redis-password
 | 
			
		||||
            {{- end }}
 | 
			
		||||
            - name: "PORT"
 | 
			
		||||
              value: {{ .Values.mastodon.web.port | quote }}
 | 
			
		||||
          {{- if (not .Values.mastodon.s3.enabled) }}
 | 
			
		||||
@@ -79,4 +93,8 @@ spec:
 | 
			
		||||
            - name: system
 | 
			
		||||
              mountPath: /opt/mastodon/public/system
 | 
			
		||||
          {{- end }}
 | 
			
		||||
      {{- with coalesce .Values.mastodon.createAdmin.nodeSelector .Values.nodeSelector }}
 | 
			
		||||
      nodeSelector:
 | 
			
		||||
        {{- . | toYaml | nindent 8 }}
 | 
			
		||||
      {{- end }}
 | 
			
		||||
{{- end }}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										3
									
								
								mastodon/templates/secret-prepare.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								mastodon/templates/secret-prepare.yml
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,3 @@
 | 
			
		||||
{{- if and (include "mastodon.createSecret" .) (not .Values.postgresql.enabled) -}}
 | 
			
		||||
{{- include "mastodon.secrets.object" (merge (dict "prepare" true ) .) }}
 | 
			
		||||
{{- end }}
 | 
			
		||||
							
								
								
									
										19
									
								
								mastodon/templates/secret-redis-preinstall.yaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										19
									
								
								mastodon/templates/secret-redis-preinstall.yaml
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,19 @@
 | 
			
		||||
{{- if not .Values.redis.enabled }}
 | 
			
		||||
{{- if and (not .Values.redis.auth.existingSecret) (not .Values.redis.existingSecret) }}
 | 
			
		||||
{{- if .Values.redis.auth.password }}
 | 
			
		||||
apiVersion: v1
 | 
			
		||||
kind: Secret
 | 
			
		||||
metadata:
 | 
			
		||||
  name: {{ include "mastodon.redis.secretName" . }}-pre-install
 | 
			
		||||
  labels:
 | 
			
		||||
    {{- include "mastodon.labels" . | nindent 4 }}
 | 
			
		||||
  annotations:
 | 
			
		||||
    helm.sh/hook: pre-install
 | 
			
		||||
    helm.sh/hook-weight: "-5"
 | 
			
		||||
    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
 | 
			
		||||
type: Opaque
 | 
			
		||||
data:
 | 
			
		||||
  redis-password: "{{ .Values.redis.auth.password | b64enc }}"
 | 
			
		||||
{{- end }}
 | 
			
		||||
{{- end }}
 | 
			
		||||
{{- end }}
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
{{- if not .Values.redis.enabled }}
 | 
			
		||||
{{- if .Values.redis.enabled }}
 | 
			
		||||
{{- if and (not .Values.redis.auth.existingSecret) (not .Values.redis.existingSecret) }}
 | 
			
		||||
{{- if .Values.redis.auth.password }}
 | 
			
		||||
apiVersion: v1
 | 
			
		||||
@@ -7,6 +7,10 @@ metadata:
 | 
			
		||||
  name: {{ include "mastodon.redis.secretName" . }}
 | 
			
		||||
  labels:
 | 
			
		||||
    {{- include "mastodon.labels" . | nindent 4 }}
 | 
			
		||||
  annotations:
 | 
			
		||||
    helm.sh/hook: pre-install
 | 
			
		||||
    helm.sh/hook-weight: "-5"
 | 
			
		||||
    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
 | 
			
		||||
type: Opaque
 | 
			
		||||
data:
 | 
			
		||||
  redis-password: "{{ .Values.redis.auth.password | b64enc }}"
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										16
									
								
								mastodon/templates/secret-smtp-bulk.yaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										16
									
								
								mastodon/templates/secret-smtp-bulk.yaml
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,16 @@
 | 
			
		||||
{{- if and .Values.mastodon.smtp.bulk.enabled (not .Values.mastodon.smtp.bulk.existingSecret) -}}
 | 
			
		||||
apiVersion: v1
 | 
			
		||||
kind: Secret
 | 
			
		||||
metadata:
 | 
			
		||||
  name: {{ printf "%s-smtp-bulk" (include "mastodon.fullname" .) }}
 | 
			
		||||
  labels:
 | 
			
		||||
    {{- include "mastodon.labels" . | nindent 4 }}
 | 
			
		||||
type: Opaque
 | 
			
		||||
data:
 | 
			
		||||
  {{- with .Values.mastodon.smtp.bulk.login }}
 | 
			
		||||
  login: {{ . | b64enc }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- with .Values.mastodon.smtp.bulk.password }}
 | 
			
		||||
  password: {{ . | b64enc }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
{{- end }}
 | 
			
		||||
@@ -1,58 +1,3 @@
 | 
			
		||||
{{- if (include "mastodon.createSecret" .) -}}
 | 
			
		||||
apiVersion: v1
 | 
			
		||||
kind: Secret
 | 
			
		||||
metadata:
 | 
			
		||||
  name: {{ template "mastodon.fullname" . }}
 | 
			
		||||
  labels:
 | 
			
		||||
    {{- include "mastodon.labels" . | nindent 4 }}
 | 
			
		||||
type: Opaque
 | 
			
		||||
data:
 | 
			
		||||
  {{- if .Values.mastodon.s3.enabled }}
 | 
			
		||||
  {{- if not .Values.mastodon.s3.existingSecret }}
 | 
			
		||||
  AWS_ACCESS_KEY_ID: "{{ .Values.mastodon.s3.access_key | b64enc }}"
 | 
			
		||||
  AWS_SECRET_ACCESS_KEY: "{{ .Values.mastodon.s3.access_secret | b64enc }}"
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- if not .Values.mastodon.secrets.existingSecret }}
 | 
			
		||||
  {{- 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.mastodon.secrets.secret_key_base }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- 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.mastodon.secrets.otp_secret }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- 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.mastodon.secrets.vapid.private_key }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- 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.mastodon.secrets.vapid.public_key }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- if not (empty .Values.mastodon.secrets.activeRecordEncryption.primaryKey) }}
 | 
			
		||||
  ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY: "{{ .Values.mastodon.secrets.activeRecordEncryption.primaryKey | b64enc }}"
 | 
			
		||||
  {{- else }}
 | 
			
		||||
  ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY: {{ required "activeRecordEncryption.primaryKey is required" .Values.mastodon.secrets.activeRecordEncryption.primaryKey }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- if not (empty .Values.mastodon.secrets.activeRecordEncryption.deterministicKey) }}
 | 
			
		||||
  ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY: "{{ .Values.mastodon.secrets.activeRecordEncryption.deterministicKey | b64enc }}"
 | 
			
		||||
  {{- else }}
 | 
			
		||||
  ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY: {{ required "activeRecordEncryption.deterministicKey is required" .Values.mastodon.secrets.activeRecordEncryption.deterministicKey }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- if not (empty .Values.mastodon.secrets.activeRecordEncryption.keyDerivationSalt) }}
 | 
			
		||||
  ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT: "{{ .Values.mastodon.secrets.activeRecordEncryption.keyDerivationSalt | b64enc }}"
 | 
			
		||||
  {{- else }}
 | 
			
		||||
  ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT: {{ required "activeRecordEncryption.keyDerivationSalt is required" .Values.mastodon.secrets.activeRecordEncryption.keyDerivationSalt }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- if not .Values.postgresql.enabled }}
 | 
			
		||||
  {{- if not .Values.postgresql.auth.existingSecret }}
 | 
			
		||||
  password: "{{ .Values.postgresql.auth.password | b64enc }}"
 | 
			
		||||
  {{- end }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
{{- include "mastodon.secrets.object" . }}
 | 
			
		||||
{{- end }}
 | 
			
		||||
 
 | 
			
		||||
@@ -11,6 +11,7 @@ spec:
 | 
			
		||||
      targetPort: streaming
 | 
			
		||||
      protocol: TCP
 | 
			
		||||
      name: streaming
 | 
			
		||||
  ipFamilyPolicy: PreferDualStack
 | 
			
		||||
  selector:
 | 
			
		||||
    {{- include "mastodon.selectorLabels" . | nindent 4 }}
 | 
			
		||||
    app.kubernetes.io/component: streaming
 | 
			
		||||
 
 | 
			
		||||
@@ -11,6 +11,7 @@ spec:
 | 
			
		||||
      targetPort: http
 | 
			
		||||
      protocol: TCP
 | 
			
		||||
      name: http
 | 
			
		||||
  ipFamilyPolicy: PreferDualStack
 | 
			
		||||
  selector:
 | 
			
		||||
    {{- include "mastodon.selectorLabels" . | nindent 4 }}
 | 
			
		||||
    app.kubernetes.io/component: web
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user