From 2cea6cd998bf42846b76abc0155e2ec5feabaa52 Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <janne@kuschku.de>
Date: Wed, 11 May 2022 18:20:48 +0200
Subject: [PATCH] feat: improve redis support
---
mailu/templates/configmap-global.yaml | 4 ++--
mailu/values.yaml | 3 +++
oauth2-proxy/templates/deployment.yaml | 2 +-
oauth2-proxy/values.yaml | 3 ++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/mailu/templates/configmap-global.yaml b/mailu/templates/configmap-global.yaml
index 76ba6e9..b4cf80a 100644
--- a/mailu/templates/configmap-global.yaml
+++ b/mailu/templates/configmap-global.yaml
@@ -23,8 +23,8 @@ data:
PASSWORD_SCHEME: "{{ .Values.config.passwordScheme }}"
POD_ADDRESS_RANGE: "{{ .Values.config.realIpFrom }}"
POSTMASTER: "{{ .Values.config.postmaster }}"
- QUOTA_STORAGE_URL: "redis://{{ .Values.redis.host }}/1"
- RATELIMIT_STORAGE_URL: "redis://{{ .Values.redis.host }}/2"
+ QUOTA_STORAGE_URL: "redis://{{ .Values.redis.host }}/{{ .Values.redis.databases.quota }}"
+ RATELIMIT_STORAGE_URL: "redis://{{ .Values.redis.host }}/{{ .Values.redis.databases.ratelimit }}"
REAL_IP_FROM: "{{ .Values.config.realIpFrom }}"
REAL_IP_HEADER: "{{ .Values.config.realIpHeader }}"
RECIPIENT_DELIMITER: "{{ .Values.config.recipientDelimiter }}"
diff --git a/mailu/values.yaml b/mailu/values.yaml
index 683df70..4d815dc 100644
--- a/mailu/values.yaml
+++ b/mailu/values.yaml
@@ -44,6 +44,9 @@ database:
redis:
host: "external-redis-hostname"
+ databases:
+ quota: 1
+ ratelimit: 2
certificate:
issuer: "letsencrypt"
diff --git a/oauth2-proxy/templates/deployment.yaml b/oauth2-proxy/templates/deployment.yaml
index 3177d85..13d67cb 100644
--- a/oauth2-proxy/templates/deployment.yaml
+++ b/oauth2-proxy/templates/deployment.yaml
@@ -57,7 +57,7 @@ spec:
- "--http-address=0.0.0.0:4180"
- "--provider=oidc"
{{ if .Values.redis.enabled }}
- - "--redis-connection-url={{ .Values.redis.url }}"
+ - "--redis-connection-url=redis://{{ .Values.redis.host }}/{{ .Values.redis.database }}"
{{ if .Values.redis.password ne "" }}
- "--redis-password={{ .Values.redis.password }}"
{{ end }}
diff --git a/oauth2-proxy/values.yaml b/oauth2-proxy/values.yaml
index 023f24b..7a23917 100644
--- a/oauth2-proxy/values.yaml
+++ b/oauth2-proxy/values.yaml
@@ -22,8 +22,9 @@ cookieSecret: ""
redis:
enabled: false
- url: "example.com"
+ host: "example.com"
password: ""
+ database: 0
service:
type: ClusterIP
--
GitLab