charts/librenms/templates/librenms-configmap.yml

@@ -6,19 +6,15 @@ metadata:
 data:
   TZ: {{ .Values.librenms.timezone}}
   DB_TIMEOUT: "60"
-  RRDCACHED_SERVER: "{{ .Release.Name }}-rrdcached:42217"
-  {{- if .Values.redis.enabled }}
   REDIS_HOST: {{ .Release.Name }}-redis-master
   REDIS_PORT: "6379"
   REDIS_DB: "0"
+  RRDCACHED_SERVER: "{{ .Release.Name }}-rrdcached:42217"
   CACHE_DRIVER: redis
   SESSION_DRIVER: redis
-  {{- end }}
-  {{- if .Values.mysql.enabled }}
   DB_HOST: {{ .Release.Name }}-mysql
   DB_USERNAME: {{.Values.mysql.auth.username}}
   DB_DATABASE: {{.Values.mysql.auth.database}}
-  {{- end }}
 --- 
 kind: ConfigMap
 apiVersion: v1

charts/librenms/templates/librenms-deployment.yml

@@ -25,12 +25,10 @@ spec:
       - name: files
         configMap:
           name: {{ .Release.Name }}-files
-      {{- if .Values.mysql.enabled }}
       - name: mysql
         secret:
           secretName: {{ .Release.Name }}-mysql
-          optional: false
+          optional: false 
-      {{- end }}
       initContainers:
         - name: init
           image: busybox:1.28
@@ -50,13 +48,11 @@ spec:
         - configMapRef:
             name: {{ .Release.Name }}
         env:
-        {{- if .Values.mysql.enabled }}
         - name: DB_PASSWORD
           valueFrom:
             secretKeyRef:
               name: {{ .Release.Name }}-mysql
               key: mysql-password
-        {{- end }}
         {{- with .Values.librenms.extraEnvs }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
@@ -67,10 +63,8 @@ spec:
           mountPath: /data/config/custom.php
           subPath: custom.php
           readOnly: true
-        {{- if .Values.mysql.enabled }}
         - name: mysql
           mountPath: "/opt/secrets/mysql/"
-        {{- end }}
         - name: env-volume
           mountPath: /data/.env
           subPath: env

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

@@ -26,11 +26,9 @@ spec:
       - name: files
         configMap:
           name: {{ .Release.Name }}-files
-      {{- if .Values.mysql.enabled }}
       - name: mysql
         secret:
           secretName: {{ .Release.Name }}-mysql
-      {{- end }}
       initContainers:
         - name: init
           image: busybox:1.28
@@ -49,13 +47,11 @@ spec:
         env:
         - name: SIDECAR_DISPATCHER
           value: "1"
-        {{- if .Values.mysql.enabled }}
         - name: DB_PASSWORD
           valueFrom:
             secretKeyRef:
               name: {{ .Release.Name }}-mysql
               key: mysql-password
-        {{- end }}
         {{- with .Values.librenms.poller.extraEnvs }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
@@ -70,19 +66,15 @@ spec:
         - name: env-volume
           mountPath: /data/.env
           subPath: env
-        {{- if .Values.mysql.enabled }}
         - name: mysql
           mountPath: "/opt/secrets/mysql/"
           readOnly: true
-        {{- end }}
         {{- if .Values.librenms.poller.resources }}
         resources: {{ toYaml .Values.librenms.poller.resources | nindent 10 }}
         {{- end }}
-        {{- if .Values.mysql.enabled }}
         readinessProbe: 
           exec:
             command: ["nc", "-z", "-v", "-w1", "{{ .Release.Name }}-mysql", "3306"]
           initialDelaySeconds: 0
           periodSeconds: 1
-          failureThreshold: 3
+          failureThreshold: 3
-        {{- end }}

charts/librenms/templates/rrdcached-deployment.yml

@@ -27,12 +27,10 @@ spec:
         persistentVolumeClaim:
           claimName: {{ .Release.Name }}-rrdcached-journal
       {{end}}
-      {{- if .Values.mysql.enabled }}
       - name: mysql
         secret:
           secretName: {{ .Release.Name }}-mysql
           optional: false # default setting; "mysecret" must exist
-      {{- end }}
       
       containers:
       - name: rrdcached
@@ -44,11 +42,9 @@ spec:
           mountPath: /data/db
         - name: journal
           mountPath: /data/journal
-        {{- if .Values.mysql.enabled }}
         - name: mysql
           mountPath: "/opt/mysql/"
           readOnly: true
-        {{- end }}
         {{end}}
         env:
         {{- with .Values.librenms.rrdcached.envs }}