mastodon: bump to v4.5.3, helm chart 6.6.3
This commit is contained in:
@@ -33,6 +33,10 @@ spec:
|
||||
template:
|
||||
metadata:
|
||||
name: {{ include "mastodon.fullname" . }}-db-migrate
|
||||
{{- with .Values.jobLabels }}
|
||||
labels:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- with .Values.jobAnnotations }}
|
||||
annotations:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
|
||||
@@ -5,6 +5,8 @@ metadata:
|
||||
labels:
|
||||
{{- include "mastodon.labels" . | nindent 4 }}
|
||||
data:
|
||||
RAILS_LOG_LEVEL: {{ .Values.mastodon.logLevel.rails | default "info" }}
|
||||
LOG_LEVEL: {{ .Values.mastodon.logLevel.streaming | default "info" }}
|
||||
DB_HOST: {{ template "mastodon.postgres.host" . }}
|
||||
DB_PORT: {{ template "mastodon.postgres.port" . }}
|
||||
DB_NAME: {{ .Values.postgresql.auth.database }}
|
||||
@@ -38,10 +40,16 @@ data:
|
||||
ES_PRESET: {{ .Values.elasticsearch.preset | default "single_node_cluster" | quote }}
|
||||
ES_HOST: {{ include "mastodon.elasticsearch.fullHostname" .}}
|
||||
ES_PORT: {{ .Values.elasticsearch.port | default "9200" | quote }}
|
||||
{{- if .Values.elasticsearch.caSecret }}
|
||||
ES_CA_FILE: /opt/opensearch/config/ca.certs
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- with .Values.elasticsearch.user }}
|
||||
ES_USER: {{ . }}
|
||||
{{- end }}
|
||||
{{- if .Values.elasticsearch.indexPrefix }}
|
||||
ES_PREFIX: {{ .Values.elasticsearch.indexPrefix | quote }}
|
||||
{{- end }}
|
||||
LOCAL_DOMAIN: {{ .Values.mastodon.local_domain }}
|
||||
{{- with .Values.mastodon.web_domain }}
|
||||
WEB_DOMAIN: {{ . }}
|
||||
@@ -93,7 +101,7 @@ data:
|
||||
S3_ENABLED: "true"
|
||||
S3_ENDPOINT: {{ .Values.mastodon.s3.endpoint }}
|
||||
S3_HOSTNAME: {{ .Values.mastodon.s3.hostname }}
|
||||
S3_PROTOCOL: "https"
|
||||
S3_PROTOCOL: {{ .Values.mastodon.s3.protocol }}
|
||||
{{- if .Values.mastodon.s3.permission }}
|
||||
S3_PERMISSION: {{ .Values.mastodon.s3.permission }}
|
||||
{{- end }}
|
||||
@@ -195,7 +203,7 @@ data:
|
||||
OIDC_DISCOVERY: {{ .Values.externalAuth.oidc.discovery | quote }}
|
||||
OIDC_SCOPE: {{ .Values.externalAuth.oidc.scope | quote }}
|
||||
OIDC_UID_FIELD: {{ .Values.externalAuth.oidc.uid_field }}
|
||||
OIDC_CLIENT_ID: {{ .Values.externalAuth.oidc.client_id }}
|
||||
OIDC_CLIENT_ID: {{ .Values.externalAuth.oidc.client_id | quote }}
|
||||
OIDC_CLIENT_SECRET: {{ .Values.externalAuth.oidc.client_secret }}
|
||||
OIDC_REDIRECT_URI: {{ .Values.externalAuth.oidc.redirect_uri }}
|
||||
OIDC_SECURITY_ASSUME_EMAIL_IS_VERIFIED: {{ .Values.externalAuth.oidc.assume_email_is_verified | quote }}
|
||||
|
||||
@@ -12,6 +12,10 @@ spec:
|
||||
template:
|
||||
metadata:
|
||||
name: {{ include "mastodon.fullname" . }}-media-remove
|
||||
{{- with .Values.jobLabels }}
|
||||
labels:
|
||||
{{- toYaml . | nindent 12 }}
|
||||
{{- end }}
|
||||
{{- with .Values.jobAnnotations }}
|
||||
annotations:
|
||||
{{- toYaml . | nindent 12 }}
|
||||
|
||||
@@ -88,6 +88,11 @@ spec:
|
||||
persistentVolumeClaim:
|
||||
claimName: {{ template "mastodon.pvc.system" $context }}
|
||||
{{- end }}
|
||||
{{- if $context.Values.elasticsearch.caSecret.name }}
|
||||
- name: elasticsearch-ca
|
||||
secret:
|
||||
secretName: {{ $context.Values.elasticsearch.caSecret.name }}
|
||||
{{- end }}
|
||||
{{- include "mastodon.statsdExporterVolume" $ | indent 8 }}
|
||||
{{- if dig "customDatabaseConfigYml" "configMapRef" "name" false . }}
|
||||
- name: config-database-yml
|
||||
@@ -249,6 +254,12 @@ spec:
|
||||
- name: system
|
||||
mountPath: /opt/mastodon/public/system
|
||||
{{- end }}
|
||||
{{- if $context.Values.elasticsearch.caSecret.name }}
|
||||
- name: elasticsearch-ca
|
||||
mountPath: /opt/opensearch/config/ca.certs
|
||||
subPath: {{ $context.Values.elasticsearch.caSecret.key }}
|
||||
readOnly: true
|
||||
{{- end }}
|
||||
{{- if dig "customDatabaseConfigYml" "configMapRef" "name" false . }}
|
||||
- name: config-database-yml
|
||||
mountPath: /opt/mastodon/config/database.yml
|
||||
|
||||
@@ -69,6 +69,11 @@ spec:
|
||||
persistentVolumeClaim:
|
||||
claimName: {{ template "mastodon.pvc.system" . }}
|
||||
{{- end }}
|
||||
{{- if .Values.elasticsearch.caSecret.name }}
|
||||
- name: elasticsearch-ca
|
||||
secret:
|
||||
secretName: {{ .Values.elasticsearch.caSecret.name}}
|
||||
{{- end }}
|
||||
{{- include "mastodon.statsdExporterVolume" $ | indent 8 }}
|
||||
{{- if .Values.mastodon.web.customDatabaseConfigYml.configMapRef.name }}
|
||||
- name: config-database-yml
|
||||
@@ -220,6 +225,12 @@ spec:
|
||||
- name: system
|
||||
mountPath: /opt/mastodon/public/system
|
||||
{{- end }}
|
||||
{{- if .Values.elasticsearch.caSecret.name }}
|
||||
- name: elasticsearch-ca
|
||||
mountPath: /opt/opensearch/config/ca.certs
|
||||
subPath: {{ .Values.elasticsearch.caSecret.key }}
|
||||
readOnly: true
|
||||
{{- end }}
|
||||
{{- if .Values.mastodon.web.customDatabaseConfigYml.configMapRef.name }}
|
||||
- name: config-database-yml
|
||||
mountPath: /opt/mastodon/config/database.yml
|
||||
|
||||
@@ -13,6 +13,10 @@ spec:
|
||||
template:
|
||||
metadata:
|
||||
name: {{ include "mastodon.fullname" . }}-assets-upload
|
||||
{{- with .Values.jobLabels }}
|
||||
labels:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- with .Values.jobAnnotations }}
|
||||
annotations:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
|
||||
@@ -13,6 +13,10 @@ spec:
|
||||
template:
|
||||
metadata:
|
||||
name: {{ include "mastodon.fullname" . }}-create-admin
|
||||
{{- with .Values.jobLabels }}
|
||||
labels:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- with .Values.jobAnnotations }}
|
||||
annotations:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
|
||||
@@ -14,6 +14,10 @@ spec:
|
||||
template:
|
||||
metadata:
|
||||
name: {{ include "mastodon.fullname" . }}-deploy-search
|
||||
{{- with .Values.jobLabels }}
|
||||
labels:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- with .Values.jobAnnotations }}
|
||||
annotations:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
|
||||
@@ -13,6 +13,10 @@ spec:
|
||||
template:
|
||||
metadata:
|
||||
name: {{ include "mastodon.fullname" . }}-create-admin
|
||||
{{- with .Values.jobLabels }}
|
||||
labels:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- with .Values.jobAnnotations }}
|
||||
annotations:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
|
||||
@@ -5,6 +5,10 @@ metadata:
|
||||
name: {{ template "mastodon.fullname" . }}-assets
|
||||
labels:
|
||||
{{- include "mastodon.labels" . | nindent 4 }}
|
||||
{{- if .Values.mastodon.persistence.assets.keepAfterDelete }}
|
||||
annotations:
|
||||
helm.sh/hook-delete-policy: keep
|
||||
{{- end }}
|
||||
spec:
|
||||
accessModes:
|
||||
- {{ .Values.mastodon.persistence.assets.accessMode }}
|
||||
|
||||
@@ -5,6 +5,10 @@ metadata:
|
||||
name: {{ template "mastodon.fullname" . }}-system
|
||||
labels:
|
||||
{{- include "mastodon.labels" . | nindent 4 }}
|
||||
{{- if .Values.mastodon.persistence.system.keepAfterDelete }}
|
||||
annotations:
|
||||
helm.sh/hook-delete-policy: keep
|
||||
{{- end }}
|
||||
spec:
|
||||
accessModes:
|
||||
- {{ .Values.mastodon.persistence.system.accessMode }}
|
||||
|
||||
Reference in New Issue
Block a user