Merge pull request #1773 from diabolocom/redis-ipv6

Feature: Allow to set Redis IP Family
OneUptime · Dec 24, 2024 · bb543ef · bb543ef
2 parents 64bba92 + 1916250
commit bb543ef
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 1 deletion.
diff --git a/Common/Server/EnvironmentConfig.ts b/Common/Server/EnvironmentConfig.ts
@@ -181,6 +181,9 @@ export const ShouldRedisTlsEnable: boolean = Boolean(
   RedisTlsCa || (RedisTlsCert && RedisTlsKey),
 );
 
+export const RedisIPFamily: number =
+  Number(process.env["REDIS_IP_FAMILY"]) || 4;
+
 export const IsProduction: boolean =
   process.env["ENVIRONMENT"] === "production";
 

diff --git a/Common/Server/Infrastructure/Redis.ts b/Common/Server/Infrastructure/Redis.ts
@@ -1,6 +1,7 @@
 import {
   RedisDb,
   RedisHostname,
+  RedisIPFamily,
   RedisPassword,
   RedisPort,
   RedisTlsCa,
@@ -40,6 +41,7 @@ export default abstract class Redis {
       password: RedisPassword,
       db: RedisDb,
       enableTLSForSentinelMode: RedisTlsSentinelMode,
+      family: RedisIPFamily,
       lazyConnect: true,
     };
 

diff --git a/HelmChart/Public/oneuptime/templates/_helpers.tpl b/HelmChart/Public/oneuptime/templates/_helpers.tpl
@@ -297,6 +297,8 @@ Usage:
         key: {{ $.Values.externalRedis.existingSecret.passwordKey }}
   {{- end }}
   {{- end }}
+- name: REDIS_IP_FAMILY
+  value: {{ printf "%s" $.Values.externalRedis.ipFamily | quote }}
 - name: REDIS_DB
   {{- if $.Values.redis.enabled }}
   value: {{ printf "0" | squote}}

diff --git a/HelmChart/Public/oneuptime/values.yaml b/HelmChart/Public/oneuptime/values.yaml
@@ -2,7 +2,6 @@ global:
   storageClass:
   clusterDomain: &global-cluster-domain cluster.local
 
-
 # Please change this to the domain name / IP where OneUptime server is hosted on.
 host: localhost
 httpProtocol: http
@@ -343,6 +342,7 @@ externalRedis:
   port:
   username:
   password:
+  ipFamily:
   # If you're using an existing secret for the password, please use this instead of password.
   existingSecret:
     name:

diff --git a/config.example.env b/config.example.env
@@ -88,6 +88,7 @@ REDIS_HOST=redis
 REDIS_PORT=6379
 REDIS_DB=0
 REDIS_USERNAME=default
+REDIS_IP_FAMILY=
 REDIS_TLS_CA=
 REDIS_TLS_SENTINEL_MODE=false
 

diff --git a/docker-compose.base.yml b/docker-compose.base.yml
@@ -90,6 +90,7 @@ x-common-server-variables: &common-server-variables
     REDIS_HOST: ${REDIS_HOST}
     REDIS_PORT: ${REDIS_PORT}
     REDIS_DB: ${REDIS_DB}
+    REDIS_IP_FAMILY: ${REDIS_IP_FAMILY}
     REDIS_TLS_CA: ${REDIS_TLS_CA}
     REDIS_TLS_SENTINEL_MODE: ${REDIS_TLS_SENTINEL_MODE}