Allow external redis and and mysql

Author: mkuurstra

charts/librenms/templates/_helpers.tpl

@@ -74,4 +74,70 @@ Create the name of the secret to use
 {{- else -}}
 {{- .Release.Name -}}
 {{- end -}}
-{{- end -}}
+{{- end -}}
+
+{{/*
+Get the MySQL host
+*/}}
+{{- define "librenms.mysqlHost" -}}
+{{- if .Values.mysql.enabled -}}
+{{ .Release.Name }}-mysql
+{{- else -}}
+{{ .Values.mysql.external.host }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Get the MySQL secret
+*/}}
+{{- define "librenms.mysqlSecret" -}}
+{{- if .Values.mysql.enabled -}}
+{{ .Release.Name }}-mysql
+{{- else -}}
+{{ .Values.mysql.external.existingSecret }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Get the MySQL secret key
+*/}}
+{{- define "librenms.mysqlSecretKey" -}}
+{{- if .Values.mysql.enabled -}}
+mysql-password
+{{- else -}}
+{{ .Values.mysql.external.existingSecretKey }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Get the MySQL port
+*/}}
+{{- define "librenms.mysqlPort" -}}
+{{- if .Values.mysql.enabled -}}
+3306
+{{- else -}}
+{{ .Values.mysql.external.port }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Get the Redis host
+*/}}
+{{- define "librenms.redisHost" -}}
+{{- if .Values.redis.enabled -}}
+{{ .Release.Name }}-redis-master
+{{- else -}}
+{{ .Values.redis.external.host }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Get the Redis port
+*/}}
+{{- define "librenms.redisPort" -}}
+{{- if .Values.redis.enabled -}}
+6379
+{{- else -}}
+{{ .Values.redis.external.port }}
+{{- end -}}
+{{- end -}}

charts/librenms/templates/librenms-configmap.yml

@@ -6,13 +6,14 @@ metadata:
 data:
   TZ: {{ .Values.librenms.timezone}}
   DB_TIMEOUT: "60"
-  REDIS_HOST: {{ .Release.Name }}-redis-master
-  REDIS_PORT: "6379"
+  REDIS_HOST: "{{ include "librenms.redisHost" . }}"
+  REDIS_PORT: "{{ include "librenms.redisPort" . }}"
   REDIS_DB: "0"
   RRDCACHED_SERVER: "{{ .Release.Name }}-rrdcached:42217"
   CACHE_DRIVER: redis
   SESSION_DRIVER: redis
-  DB_HOST: {{ .Release.Name }}-mysql
+  DB_HOST: "{{ include "librenms.mysqlHost" . }}"
+  DB_PORT: "{{ include "librenms.mysqlPort" . }}"
   DB_USERNAME: {{.Values.mysql.auth.username}}
   DB_DATABASE: {{.Values.mysql.auth.database}}
 --- 
@@ -24,4 +25,4 @@ data:
   custom.php: |-
 {{ tpl (.Files.Get "files/custom.php") . | indent 4 }}
   init.sh: |-
-{{ .Files.Get "files/init.sh" | indent 4 }}
+{{ .Files.Get "files/init.sh" | indent 4 }}

charts/librenms/templates/librenms-cron.yml

@@ -27,8 +27,8 @@ spec:
             - name: DB_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Release.Name }}-mysql
-                  key: mysql-password
+                  name: {{ include "librenms.mysqlSecret" . }}
+                  key: {{ include "librenms.mysqlSecretKey" . }}
             {{- with .Values.librenms.extraEnvs }}
             {{- toYaml . | nindent 8 }}
             {{- end }}
@@ -48,4 +48,4 @@ spec:
             {{- toYaml . | nindent 8 }}
             {{- end }}
           restartPolicy: OnFailure
-{{ end }}
+{{ end }}

charts/librenms/templates/librenms-deployment.yml

@@ -32,7 +32,7 @@ spec:
           name: {{ .Release.Name }}-files
       - name: mysql
         secret:
-          secretName: {{ .Release.Name }}-mysql
+          secretName: {{ include "librenms.mysqlSecret" . }}
           optional: false 
       initContainers:
         - name: init
@@ -60,8 +60,15 @@ spec:
         - name: DB_PASSWORD
           valueFrom:
             secretKeyRef:
-              name: {{ .Release.Name }}-mysql
-              key: mysql-password
+              name: {{ include "librenms.mysqlSecret" . }}
+              key: {{ include "librenms.mysqlSecretKey" . }}
+        {{ if not .Values.redis.enabled }}
+        - name: REDIS_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.redis.external.existingSecret }}
+              key: {{ .Values.redis.external.existingSecretKey }}
+        {{- end }}
         {{- with .Values.librenms.extraEnvs }}
         {{- toYaml . | nindent 8 }}
         {{- end }}

charts/librenms/templates/librenms-poller-ss.yml

@@ -33,7 +33,7 @@ spec:
           name: {{ .Release.Name }}-files
       - name: mysql
         secret:
-          secretName: {{ .Release.Name }}-mysql
+          secretName: {{ include "librenms.mysqlSecret" . }}
       initContainers:
         - name: init
           image: busybox:1.28
@@ -59,8 +59,15 @@ spec:
         - name: DB_PASSWORD
           valueFrom:
             secretKeyRef:
-              name: {{ .Release.Name }}-mysql
-              key: mysql-password
+              name: {{ include "librenms.mysqlSecret" . }}
+              key: {{ include "librenms.mysqlSecretKey" . }}
+        {{ if not .Values.redis.enabled }}
+        - name: REDIS_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.redis.external.existingSecret }}
+              key: {{ .Values.redis.external.existingSecretKey }}
+        {{- end }}
         {{- with .Values.librenms.poller.extraEnvs }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
@@ -83,7 +90,7 @@ spec:
         {{- end }}
         readinessProbe: 
           exec:
-            command: ["nc", "-z", "-v", "-w1", "{{ .Release.Name }}-mysql", "3306"]
+            command: ["nc", "-z", "-v", "-w1", "{{ include "librenms.mysqlHost" . }}", "3306"]
           initialDelaySeconds: 0
           periodSeconds: 1
           failureThreshold: 3

charts/librenms/templates/librenms-secret.yml

@@ -7,4 +7,4 @@ metadata:
 type: Opaque
 data:
   appkey: {{ .Values.librenms.appkey | b64enc | quote }}
-{{- end }}
+{{- end }}

charts/librenms/templates/rrdcached-deployment.yml

@@ -56,3 +56,4 @@ spec:
         {{- if .Values.librenms.rrdcached.resources }}
         resources: {{ toYaml .Values.librenms.rrdcached.resources | nindent 10 }}
         {{- end }}
+

charts/librenms/values.yaml

@@ -168,6 +168,23 @@ mysql:
     username: librenms
     database: librenms
 
+  # -- External MySQL configuration
+  # -- Only used when mysql.enabled is set to false
+  # -- Configure these settings to connect to an existing MySQL instance
+  external:
+    # -- External MySQL host address
+    host: your-mysql-host
+    # -- External MySQL port
+    port: 3306
+    # -- External MySQL username for LibreNMS
+    username: librenms
+    # -- External MySQL database name
+    database: librenms
+    # -- Name of existing Kubernetes secret containing the MySQL password
+    existingSecret: mysql-credentials-secret
+    # -- Key in the existing secret that contains the MySQL password
+    existingSecretKey: mysql-password
+
 # -- Configuration for redis dependency chart by Bitnami. See their chart for
 # more information: https://github.com/bitnami/charts/tree/master/bitnami/redis
 redis:
@@ -183,3 +200,16 @@ redis:
     disableCommands: []
 
   architecture: standalone
+
+  # -- External Redis configuration
+  # -- Only used when redis.enabled is set to false
+  # -- Configure these settings to connect to an existing Redis instance
+  external:
+    # -- External Redis host address
+    host: your-redis-host
+    # -- External Redis port
+    port: 6379
+    # -- Name of existing Kubernetes secret containing the Redis password
+    existingSecret: redis-credentials-secret
+    # -- Key in the existing secret that contains the Redis password
+    existingSecretKey: REDIS_PASSWORD