mirror of
https://github.com/mastodon/chart
synced 2025-03-14 21:11:50 +00:00
Additional redis configuration options (#134)
This commit is contained in:
parent
69df6394ae
commit
336f736a5c
|
@ -171,6 +171,36 @@ Get the redis secret.
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
|
||||||
|
{{/*
|
||||||
|
Get the redis secret (sidekiq).
|
||||||
|
*/}}
|
||||||
|
{{- define "mastodon.redis.sidekiq.secretName" -}}
|
||||||
|
{{- if .Values.redis.sidekiq.auth.existingSecret }}
|
||||||
|
{{- printf "%s" (tpl .Values.redis.sidekiq.auth.existingSecret $) -}}
|
||||||
|
{{- else if .Values.redis.auth.existingSecret }}
|
||||||
|
{{- printf "%s" (tpl .Values.redis.auth.existingSecret $) -}}
|
||||||
|
{{- else if .Values.redis.existingSecret }}
|
||||||
|
{{- printf "%s" (tpl .Values.redis.existingSecret $) -}}
|
||||||
|
{{- else -}}
|
||||||
|
{{- printf "%s-redis" (tpl .Release.Name $) -}}
|
||||||
|
{{- end -}}
|
||||||
|
{{- end -}}
|
||||||
|
|
||||||
|
{{/*
|
||||||
|
Get the redis secret (cache).
|
||||||
|
*/}}
|
||||||
|
{{- define "mastodon.redis.cache.secretName" -}}
|
||||||
|
{{- if .Values.redis.cache.auth.existingSecret }}
|
||||||
|
{{- printf "%s" (tpl .Values.redis.cache.auth.existingSecret $) -}}
|
||||||
|
{{- else if .Values.redis.auth.existingSecret }}
|
||||||
|
{{- printf "%s" (tpl .Values.redis.auth.existingSecret $) -}}
|
||||||
|
{{- else if .Values.redis.existingSecret }}
|
||||||
|
{{- printf "%s" (tpl .Values.redis.existingSecret $) -}}
|
||||||
|
{{- else -}}
|
||||||
|
{{- printf "%s-redis" (tpl .Release.Name $) -}}
|
||||||
|
{{- end -}}
|
||||||
|
{{- end -}}
|
||||||
|
|
||||||
{{/*
|
{{/*
|
||||||
Return true if a mastodon secret object should be created
|
Return true if a mastodon secret object should be created
|
||||||
*/}}
|
*/}}
|
||||||
|
|
|
@ -72,6 +72,30 @@ data:
|
||||||
REDIS_HOST: {{ required "When the redis chart is disabled .Values.redis.hostname is required" .Values.redis.hostname }}
|
REDIS_HOST: {{ required "When the redis chart is disabled .Values.redis.hostname is required" .Values.redis.hostname }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
REDIS_PORT: {{ .Values.redis.port | default "6379" | quote }}
|
REDIS_PORT: {{ .Values.redis.port | default "6379" | quote }}
|
||||||
|
{{- if .Values.redis.sidekiq.enabled }}
|
||||||
|
{{- if .Values.redis.sidekiq.hostname }}
|
||||||
|
SIDEKIQ_REDIS_HOST: {{ .Values.redis.sidekiq.hostname }}
|
||||||
|
{{- else }}
|
||||||
|
SIDEKIQ_REDIS_HOST: {{ .Values.redis.hostname }}
|
||||||
|
{{- end }}
|
||||||
|
{{- if .Values.redis.sidekiq.port }}
|
||||||
|
SIDEKIQ_REDIS_PORT: {{ .Values.redis.sidekiq.port | quote }}
|
||||||
|
{{- else }}
|
||||||
|
SIDEKIQ_REDIS_PORT: {{ .Values.redis.port | default "6379" | quote }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
{{- if .Values.redis.cache.enabled }}
|
||||||
|
{{- if .Values.redis.cache.hostname }}
|
||||||
|
CACHE_REDIS_HOST: {{ .Values.redis.cache.hostname }}
|
||||||
|
{{- else }}
|
||||||
|
CACHE_REDIS_HOST: {{ .Values.redis.hostname}}
|
||||||
|
{{- end }}
|
||||||
|
{{- if .Values.redis.cache.port }}
|
||||||
|
CACHE_REDIS_PORT: {{ .Values.redis.cache.port | quote }}
|
||||||
|
{{- else }}
|
||||||
|
CACHE_REDIS_PORT: {{ .Values.redis.port | default "6379" | quote }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
{{- if .Values.mastodon.s3.enabled }}
|
{{- if .Values.mastodon.s3.enabled }}
|
||||||
S3_BUCKET: {{ .Values.mastodon.s3.bucket }}
|
S3_BUCKET: {{ .Values.mastodon.s3.bucket }}
|
||||||
S3_ENABLED: "true"
|
S3_ENABLED: "true"
|
||||||
|
@ -389,4 +413,3 @@ data:
|
||||||
{{- with .Values.timezone }}
|
{{- with .Values.timezone }}
|
||||||
TZ: {{ . | quote }}
|
TZ: {{ . | quote }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
|
@ -65,6 +65,20 @@ spec:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: {{ template "mastodon.redis.secretName" . }}
|
name: {{ template "mastodon.redis.secretName" . }}
|
||||||
key: redis-password
|
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) }}
|
{{- if and .Values.elasticsearch.existingSecret (or .Values.elasticsearch.enabled .Values.elasticsearch.hostname) }}
|
||||||
- name: "ES_PASS"
|
- name: "ES_PASS"
|
||||||
valueFrom:
|
valueFrom:
|
||||||
|
|
|
@ -126,6 +126,20 @@ spec:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: {{ template "mastodon.redis.secretName" $context }}
|
name: {{ template "mastodon.redis.secretName" $context }}
|
||||||
key: redis-password
|
key: redis-password
|
||||||
|
{{- if and $context.Values.redis.sidekiq.enabled $context.Values.redis.sidekiq.auth.existingSecret }}
|
||||||
|
- name: "SIDEKIQ_REDIS_PASSWORD"
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: {{ template "mastodon.redis.sidekiq.secretName" $context }}
|
||||||
|
key: redis-password
|
||||||
|
{{- end }}
|
||||||
|
{{- if and $context.Values.redis.cache.enabled $context.Values.redis.cache.auth.existingSecret }}
|
||||||
|
- name: "CACHE_REDIS_PASSWORD"
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: {{ template "mastodon.redis.cache.secretName" $context }}
|
||||||
|
key: redis-password
|
||||||
|
{{- end }}
|
||||||
{{- if and $context.Values.elasticsearch.existingSecret (or $context.Values.elasticsearch.enabled $context.Values.elasticsearch.hostname) }}
|
{{- if and $context.Values.elasticsearch.existingSecret (or $context.Values.elasticsearch.enabled $context.Values.elasticsearch.hostname) }}
|
||||||
- name: "ES_PASS"
|
- name: "ES_PASS"
|
||||||
valueFrom:
|
valueFrom:
|
||||||
|
|
|
@ -103,6 +103,20 @@ spec:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: {{ template "mastodon.redis.secretName" . }}
|
name: {{ template "mastodon.redis.secretName" . }}
|
||||||
key: redis-password
|
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"
|
- name: "PORT"
|
||||||
value: {{ .Values.mastodon.streaming.port | quote }}
|
value: {{ .Values.mastodon.streaming.port | quote }}
|
||||||
ports:
|
ports:
|
||||||
|
|
|
@ -101,6 +101,20 @@ spec:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: {{ template "mastodon.redis.secretName" . }}
|
name: {{ template "mastodon.redis.secretName" . }}
|
||||||
key: redis-password
|
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) }}
|
{{- if and .Values.elasticsearch.existingSecret (or .Values.elasticsearch.enabled .Values.elasticsearch.hostname) }}
|
||||||
- name: "ES_PASS"
|
- name: "ES_PASS"
|
||||||
valueFrom:
|
valueFrom:
|
||||||
|
|
|
@ -67,6 +67,20 @@ spec:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: {{ template "mastodon.redis.secretName" . }}
|
name: {{ template "mastodon.redis.secretName" . }}
|
||||||
key: redis-password
|
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"
|
- name: "PORT"
|
||||||
value: {{ .Values.mastodon.web.port | quote }}
|
value: {{ .Values.mastodon.web.port | quote }}
|
||||||
{{- if (not .Values.mastodon.s3.enabled) }}
|
{{- if (not .Values.mastodon.s3.enabled) }}
|
||||||
|
|
|
@ -67,6 +67,20 @@ spec:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: {{ template "mastodon.redis.secretName" . }}
|
name: {{ template "mastodon.redis.secretName" . }}
|
||||||
key: redis-password
|
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) }}
|
{{- if and .Values.elasticsearch.existingSecret (or .Values.elasticsearch.enabled .Values.elasticsearch.hostname) }}
|
||||||
- name: "ES_PASS"
|
- name: "ES_PASS"
|
||||||
valueFrom:
|
valueFrom:
|
||||||
|
|
|
@ -72,6 +72,20 @@ spec:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: {{ template "mastodon.redis.secretName" . }}
|
name: {{ template "mastodon.redis.secretName" . }}
|
||||||
key: redis-password
|
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"
|
- name: "PORT"
|
||||||
value: {{ .Values.mastodon.web.port | quote }}
|
value: {{ .Values.mastodon.web.port | quote }}
|
||||||
{{- if (not .Values.mastodon.s3.enabled) }}
|
{{- if (not .Values.mastodon.s3.enabled) }}
|
||||||
|
|
|
@ -67,6 +67,20 @@ spec:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: {{ template "mastodon.redis.secretName" . }}
|
name: {{ template "mastodon.redis.secretName" . }}
|
||||||
key: redis-password
|
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"
|
- name: "PORT"
|
||||||
value: {{ .Values.mastodon.web.port | quote }}
|
value: {{ .Values.mastodon.web.port | quote }}
|
||||||
{{- if (not .Values.mastodon.s3.enabled) }}
|
{{- if (not .Values.mastodon.s3.enabled) }}
|
||||||
|
|
28
values.yaml
28
values.yaml
|
@ -454,6 +454,34 @@ redis:
|
||||||
replica:
|
replica:
|
||||||
replicaCount: 0
|
replicaCount: 0
|
||||||
|
|
||||||
|
# Configuration for a separate redis instance only for sidekiq processing.
|
||||||
|
# If enabled, any values not specified will be copied from the base config.
|
||||||
|
# If set to false, the main redis instance will be used, and all values will
|
||||||
|
# be ignored.
|
||||||
|
sidekiq:
|
||||||
|
enabled: false
|
||||||
|
hostname: ""
|
||||||
|
port: 6379
|
||||||
|
auth:
|
||||||
|
password: ""
|
||||||
|
# you can also specify the name of an existing Secret
|
||||||
|
# with a key of redis-password set to the password you want
|
||||||
|
existingSecret: ""
|
||||||
|
|
||||||
|
# Configuration for a separate redis instance only for cache.
|
||||||
|
# If enabled, any values not specified will be copied from the base config.
|
||||||
|
# If set to false, the main redis instance will be used, and all values will
|
||||||
|
# be ignored.
|
||||||
|
cache:
|
||||||
|
enabled: false
|
||||||
|
hostname: ""
|
||||||
|
port: 6379
|
||||||
|
auth:
|
||||||
|
password: ""
|
||||||
|
# you can also specify the name of an existing Secret
|
||||||
|
# with a key of redis-password set to the password you want
|
||||||
|
existingSecret: ""
|
||||||
|
|
||||||
# @ignored
|
# @ignored
|
||||||
service:
|
service:
|
||||||
type: ClusterIP
|
type: ClusterIP
|
||||||
|
|
Loading…
Reference in New Issue
Block a user