feat: update diode chart to support external redis username

Author: RangerRick

charts/diode/templates/_helpers.tpl

@@ -291,6 +291,19 @@ Create the port of the Redis database
 {{- end }}
 {{- end }}
 
+{{/*
+Create the username of the Redis database
+*/}}
+{{- define "diode.redis.username" -}}
+{{- if .Values.redis.enabled -}}
+{{- printf "" }}
+{{- else if and .Values.externalRedis (hasKey .Values.externalRedis "username") -}}
+{{- .Values.externalRedis.username }}
+{{- else -}}
+{{- fail "externalRedis.username must be defined when redis.enabled is false" }}
+{{- end }}
+{{- end }}
+
 {{/*
 Create the database name for PostgreSQL
 */}}

charts/diode/templates/diode-ingester-configmap.yaml

@@ -17,6 +17,7 @@ data:
   SENTRY_DSN: {{ $config.sentryDsn | quote }}
   REDIS_HOST: {{ include "diode.redis.hostname" . | quote }}
   REDIS_PORT: {{ include "diode.redis.port" . | quote }}
+  REDIS_USERNAME: {{ include "diode.redis.username" . | quote }}
   {{- if and .Values.externalRedis.tls .Values.externalRedis.tls.enabled }}
   REDIS_TLS_ENABLED: "true"
   REDIS_TLS_SKIP_VERIFY: {{ .Values.externalRedis.tls.skipVerify | default false | quote }}

charts/diode/templates/diode-reconciler-configmap.yaml

@@ -17,6 +17,7 @@ data:
   SENTRY_DSN: {{ $config.sentryDsn | quote }}
   REDIS_HOST: {{ include "diode.redis.hostname" . | quote }}
   REDIS_PORT: {{ include "diode.redis.port" . | quote }}
+  REDIS_USERNAME: {{ include "diode.redis.username" . | quote }}
   REDIS_DB: {{ $config.redisDb | default "0" | quote }}
   REDIS_STREAM_DB: {{ $config.redisStreamDb | default "1" | quote }}
   {{- if and .Values.externalRedis.tls .Values.externalRedis.tls.enabled }}

charts/diode/values.yaml

@@ -57,6 +57,8 @@ externalRedis:
   hostname: localhost
   # -- port
   port: 6379
+  # -- username (optional, Redis 6+)
+  username: ""
   tls:
     # -- enable TLS
     enabled: false

diode-server/docker/docker-compose.yaml

@@ -23,6 +23,7 @@ services:
       - REDIS_PASSWORD=${REDIS_PASSWORD}
       - REDIS_HOST=${REDIS_HOST}
       - REDIS_PORT=${REDIS_PORT}
+      - REDIS_USERNAME=""
       - SENTRY_DSN=${SENTRY_DSN}
       - TELEMETRY_METRICS_EXPORTER=${TELEMETRY_METRICS_EXPORTER}
       - TELEMETRY_TRACES_EXPORTER=${TELEMETRY_TRACES_EXPORTER}
@@ -40,6 +41,7 @@ services:
       - REDIS_PASSWORD=${REDIS_PASSWORD}
       - REDIS_HOST=${REDIS_HOST}
       - REDIS_PORT=${REDIS_PORT}
+      - REDIS_USERNAME=""
       - NETBOX_DIODE_PLUGIN_API_BASE_URL=${NETBOX_DIODE_PLUGIN_API_BASE_URL}
       - NETBOX_DIODE_PLUGIN_SKIP_TLS_VERIFY=${NETBOX_DIODE_PLUGIN_SKIP_TLS_VERIFY}
       - LOGGING_LEVEL=${LOGGING_LEVEL}

diode-server/docker/sample.env

@@ -2,6 +2,7 @@ DIODE_NGINX_PORT=8080
 REDIS_PASSWORD=<PLACEHOLDER_SECRET>
 REDIS_HOST=redis
 REDIS_PORT=6378
+REDIS_USERNAME=""
 NETBOX_DIODE_PLUGIN_API_BASE_URL=<http://NETBOX_HOST>/api/plugins/diode
 NETBOX_DIODE_PLUGIN_SKIP_TLS_VERIFY=false
 LOGGING_LEVEL=DEBUG

diode-server/ingester/component_test.go

@@ -45,6 +45,7 @@ func setupEnv(redisAddr string) {
 	_ = os.Setenv("GRPC_PORT", grpcPort)
 	_ = os.Setenv("REDIS_HOST", host)
 	_ = os.Setenv("REDIS_PORT", port)
+	_ = os.Setenv("REDIS_USERNAME", "")
 	_ = os.Setenv("REDIS_PASSWORD", "")
 	_ = os.Setenv("REDIS_DB", "0")
 	_ = os.Setenv("REDIS_STREAM_DB", "1")
@@ -59,6 +60,7 @@ func teardownEnv() {
 	_ = os.Unsetenv("GRPC_PORT")
 	_ = os.Unsetenv("REDIS_HOST")
 	_ = os.Unsetenv("REDIS_PORT")
+	_ = os.Unsetenv("REDIS_USERNAME")
 	_ = os.Unsetenv("REDIS_PASSWORD")
 	_ = os.Unsetenv("REDIS_DB")
 	_ = os.Unsetenv("REDIS_STREAM_DB")

diode-server/reconciler/reconciler_test.go

@@ -26,6 +26,7 @@ func setupEnv(redisAddr string) {
 	_ = os.Setenv("GRPC_PORT", grpcPort)
 	_ = os.Setenv("REDIS_HOST", host)
 	_ = os.Setenv("REDIS_PORT", port)
+	_ = os.Setenv("REDIS_USERNAME", "")
 	_ = os.Setenv("REDIS_PASSWORD", "")
 	_ = os.Setenv("REDIS_DB", "0")
 	_ = os.Setenv("REDIS_STREAM_DB", "1")
@@ -49,6 +50,7 @@ func teardownEnv() {
 	_ = os.Unsetenv("GRPC_PORT")
 	_ = os.Unsetenv("REDIS_HOST")
 	_ = os.Unsetenv("REDIS_PORT")
+	_ = os.Unsetenv("REDIS_USERNAME")
 	_ = os.Unsetenv("REDIS_PASSWORD")
 	_ = os.Unsetenv("REDIS_DB")
 	_ = os.Unsetenv("REDIS_STREAM_DB")