mirror/MetaGer
0
0
Fork 0
mirror of https://gitlab.metager.de/open-source/MetaGer.git synced 2025-10-06 00:32:55 +02:00
Code Issues Releases Wiki Activity

update Redis configuration to use secret references for passwords in deployment templates

Browse Source
This commit is contained in:
Dominik Hebeler
2025-09-17 08:41:51 +02:00
parent 1f4f0ffd03
commit 30dcfd1a6d
3 changed files with 80 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
chart/templates/deployment-worker.yaml
View File

@@ -51,8 +51,23 @@ spec:
value: {{ .Values.environment }}
- name: REDIS_HOST
value: {{ .Release.Name}}-redis-sentinel-redis
- name: REDIS_PASSWORD
valueFrom:
secretKeyRef:
name: {{ .Release.Name }}-redis-sentinel
key: REDIS_PASSWORD
- name: REDIS_SENTINEL_HOST
value: {{ .Release.Name}}-redis-sentinel
- name: REDIS_SENTINEL_PASSWORD
valueFrom:
secretKeyRef:
name: {{ .Release.Name }}-redis-sentinel
key: SENTINEL_PASSWORD
- name: REDIS_SENTINEL_REDIS_PASSWORD
valueFrom:
secretKeyRef:
name: {{ .Release.Name }}-redis-sentinel
key: REDIS_PASSWORD
- name: REDIS_PORT
value: "6379"
{{- if gt (len .Values.ingress.hosts) 0 -}}

64
chart/templates/deployment.yaml
View File

@@ -51,8 +51,23 @@ spec:
value: {{ .Values.app_url }}
- name: REDIS_HOST
value: {{ .Release.Name}}-redis-sentinel-redis
- name: REDIS_PASSWORD
valueFrom:
secretKeyRef:
name: {{ .Release.Name }}-redis-sentinel
key: REDIS_PASSWORD
- name: REDIS_SENTINEL_HOST
value: {{ .Release.Name}}-redis-sentinel
- name: REDIS_SENTINEL_PASSWORD
valueFrom:
secretKeyRef:
name: {{ .Release.Name }}-redis-sentinel
key: SENTINEL_PASSWORD
- name: REDIS_SENTINEL_REDIS_PASSWORD
valueFrom:
secretKeyRef:
name: {{ .Release.Name }}-redis-sentinel
key: REDIS_PASSWORD
- name: REDIS_PORT
value: "6379"
{{- if gt (len .Values.ingress.hosts) 0 -}}
@@ -132,7 +147,24 @@ spec:
- name: APP_URL
value: {{ .Values.app_url }}
- name: REDIS_HOST
value: {{ .Release.Name}}-redis-master.metager-2.svc.cluster.local
value: {{ .Release.Name}}-redis-sentinel-redis
- name: REDIS_PASSWORD
valueFrom:
secretKeyRef:
name: {{ .Release.Name }}-redis-sentinel
key: REDIS_PASSWORD
- name: REDIS_SENTINEL_HOST
value: {{ .Release.Name}}-redis-sentinel
- name: REDIS_SENTINEL_PASSWORD
valueFrom:
secretKeyRef:
name: {{ .Release.Name }}-redis-sentinel
key: SENTINEL_PASSWORD
- name: REDIS_SENTINEL_REDIS_PASSWORD
valueFrom:
secretKeyRef:
name: {{ .Release.Name }}-redis-sentinel
key: REDIS_PASSWORD
- name: REDIS_PORT
value: "6379"
{{- if gt (len .Values.ingress.hosts) 0 -}}
@@ -189,8 +221,23 @@ spec:
value: {{ .Values.environment }}
- name: REDIS_HOST
value: {{ .Release.Name}}-redis-sentinel-redis
- name: REDIS_PASSWORD
valueFrom:
secretKeyRef:
name: {{ .Release.Name }}-redis-sentinel
key: REDIS_PASSWORD
- name: REDIS_SENTINEL_HOST
value: {{ .Release.Name}}-redis-sentinel
- name: REDIS_SENTINEL_PASSWORD
valueFrom:
secretKeyRef:
name: {{ .Release.Name }}-redis-sentinel
key: SENTINEL_PASSWORD
- name: REDIS_SENTINEL_REDIS_PASSWORD
valueFrom:
secretKeyRef:
name: {{ .Release.Name }}-redis-sentinel
key: REDIS_PASSWORD
- name: REDIS_PORT
value: "6379"
{{- if gt (len .Values.ingress.hosts) 0 -}}
@@ -270,8 +317,23 @@ spec:
value: {{ .Values.environment }}
- name: REDIS_HOST
value: {{ .Release.Name}}-redis-sentinel-redis
- name: REDIS_PASSWORD
valueFrom:
secretKeyRef:
name: {{ .Release.Name }}-redis-sentinel
key: REDIS_PASSWORD
- name: REDIS_SENTINEL_HOST
value: {{ .Release.Name}}-redis-sentinel
- name: REDIS_SENTINEL_PASSWORD
valueFrom:
secretKeyRef:
name: {{ .Release.Name }}-redis-sentinel
key: SENTINEL_PASSWORD
- name: REDIS_SENTINEL_REDIS_PASSWORD
valueFrom:
secretKeyRef:
name: {{ .Release.Name }}-redis-sentinel
key: REDIS_PASSWORD
- name: REDIS_PORT
value: "6379"
{{- if gt (len .Values.ingress.hosts) 0 -}}

5
metager/config/database.php
View File

@@ -143,10 +143,9 @@ return [
'options' => [
'service' => env('REDIS_SENTINEL_SERVICE', 'mymaster'),
'replication' => 'sentinel',
'password' => env('REDIS_SENTINEL_PASSWORD', null),
'password' => env('REDIS_SENTINEL_REDIS_PASSWORD', null),
'parameters' => [
'database' => 0,
'password' => env('REDIS_SENTINEL_PASSWORD', null),
'database' => 0
]
]
],