Fix missing end

Merge pull request #78 from librenms/develop

charts/librenms/Chart.lock

@@ -1,9 +1,9 @@
 dependencies:
 - name: redis
   repository: https://charts.bitnami.com/bitnami
-  version: 21.0.0
+  version: 21.1.3
 - name: mysql
   repository: https://charts.bitnami.com/bitnami
-  version: 12.3.5
+  version: 13.0.0
-digest: sha256:214163c0521072c3d551f20eea1b9d77384283c25c58c5649ce05e22e73abc28
+digest: sha256:ab48525b17834c3b7e491483bb35fad9d11ddbf74368a352cafd59dbbe34d940
-generated: "2025-05-06T17:25:55.29966285Z"
+generated: "2025-05-19T07:25:23.570909791Z"

charts/librenms/Chart.yaml

@@ -2,17 +2,17 @@ apiVersion: v2
 name: librenms
 description: LibreNMS is an autodiscovering PHP/MySQL-based network monitoring system.
 type: application
-version: 5.0.1
+version: 5.0.2
-appVersion: "25.4.0"
+appVersion: "25.5.0"
 maintainers:
   - name: jacobw
     url: https://github.com/jacobw
 dependencies:
   - name: redis
-    version: "~21.0.0"
+    version: "~21.1.0"
     repository: "https://charts.bitnami.com/bitnami"
     condition: redis.enabled
   - name: mysql
-    version: "~12.3.0"
+    version: "~13.0.0"
     repository: "https://charts.bitnami.com/bitnami"
     condition: mysql.enabled

charts/librenms/templates/librenms-configmap.yml

@@ -6,15 +6,19 @@ 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,10 +25,12 @@ 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
@@ -48,11 +50,13 @@ 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 }}
@@ -63,8 +67,10 @@ 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,9 +26,11 @@ 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
@@ -47,11 +49,13 @@ 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 }}
@@ -66,15 +70,19 @@ 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,10 +27,12 @@ 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
@@ -42,9 +44,11 @@ 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 }}

charts/librenms/values.yaml

@@ -6,7 +6,7 @@ librenms:
     # -- repository is the image repository to pull from.
     repository: librenms/librenms
     # -- tag is image tag to pull.
-    tag: 25.4.0
+    tag: 25.5.0
 
   # -- Laravel appkey used by LibreNMS, this should be generated by you and is a
   # required setting. See the README for more information