fix: external mongo values (#78)

charts/freshrss/Chart.yaml

@@ -23,10 +23,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.4.0
+version: 1.4.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.24.0"
+appVersion: "1.24.1"

charts/freshrss/README.md

@@ -1,6 +1,6 @@
 # freshrss
 
-![Version: 1.4.0](https://img.shields.io/badge/Version-1.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.24.0](https://img.shields.io/badge/AppVersion-1.24.0-informational?style=flat-square)
+![Version: 1.4.1](https://img.shields.io/badge/Version-1.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.24.1](https://img.shields.io/badge/AppVersion-1.24.1-informational?style=flat-square)
 
 A Helm chart for FreshRSS
 

charts/jellyfin/Chart.yaml

@@ -25,10 +25,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.2.0
+version: 1.2.4
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "10.9.2"
+appVersion: "10.9.6"

charts/jellyfin/README.md

@@ -1,6 +1,6 @@
 # jellyfin
 
-![Version: 1.2.0](https://img.shields.io/badge/Version-1.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 10.9.2](https://img.shields.io/badge/AppVersion-10.9.2-informational?style=flat-square)
+![Version: 1.2.4](https://img.shields.io/badge/Version-1.2.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 10.9.6](https://img.shields.io/badge/AppVersion-10.9.6-informational?style=flat-square)
 
 A Helm chart for Jellyfin, the Free Software Media System that puts you in control of managing and streaming your media.
 

charts/unifi-controller/.gitignore

@@ -1 +1,2 @@
 values.test.yaml
+charts/*.tgz

charts/unifi-controller/Chart.lock

@@ -0,0 +1,6 @@
+dependencies:
+- name: mongodb
+  repository: https://charts.bitnami.com/bitnami
+  version: 15.3.0
+digest: sha256:f6cc8e47d7f68e327889b4807f488a346c70c7da8c80ea623aa7a1a8c6d95877
+generated: "2024-05-10T21:31:20.762106802+01:00"

charts/unifi-controller/Chart.yaml

@@ -15,10 +15,16 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.0.0
+version: 3.0.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "8.0.7"
+appVersion: "8.1.127"
+
+dependencies:
+  - name: mongodb
+    version: ^15.3.0
+    repository: https://charts.bitnami.com/bitnami
+    condition: mongodb.enabled

charts/unifi-controller/README.md

@@ -1,9 +1,15 @@
 # unifi-controller
 
-![Version: 1.1.0](https://img.shields.io/badge/Version-1.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.4.156](https://img.shields.io/badge/AppVersion-7.4.156-informational?style=flat-square)
+![Version: 3.0.1](https://img.shields.io/badge/Version-3.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 8.1.127](https://img.shields.io/badge/AppVersion-8.1.127-informational?style=flat-square)
 
 A Helm chart for the Unifi Controller
 
+## Requirements
+
+| Repository | Name | Version |
+|------------|------|---------|
+| https://charts.bitnami.com/bitnami | mongodb | ^15.3.0 |
+
 ## Values
 
 | Key | Type | Default | Description |
@@ -12,9 +18,13 @@ A Helm chart for the Unifi Controller
 | config.jvmMemory.limit | string | `"default"` | Integer value in MB or `default` for memory limit for JVM |
 | config.jvmMemory.startup | string | `"default"` | Integer value in MB or `default` for startup memory for JVM |
 | config.timezone | string | `"Etc/UTC"` | Timezone - see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List |
+| externalMongodb.database | string | `"unifi"` |  |
+| externalMongodb.enabled | bool | `false` | Use an external MongoDB database |
+| externalMongodb.port | int | `27017` |  |
+| externalMongodb.username | string | `"unifi"` |  |
 | fullnameOverride | string | `""` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
-| image.repository | string | `"quay.io/linuxserver.io/unifi-controller"` |  |
+| image.repository | string | `"lscr.io/linuxserver/unifi-network-application"` |  |
 | image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion. |
 | imagePullSecrets | list | `[]` |  |
 | ingress.annotations | object | `{}` |  |
@@ -24,6 +34,13 @@ A Helm chart for the Unifi Controller
 | ingress.hosts[0].paths[0].path | string | `"/"` |  |
 | ingress.hosts[0].paths[0].pathType | string | `"ImplementationSpecific"` |  |
 | ingress.tls | list | `[]` |  |
+| mongodb.auth.databases[0] | string | `"unifi"` |  |
+| mongodb.auth.passwords[0] | string | `"unifi"` |  |
+| mongodb.auth.rootPassword | string | `"unifi"` |  |
+| mongodb.auth.rootUser | string | `"root"` |  |
+| mongodb.auth.usernames[0] | string | `"unifi"` |  |
+| mongodb.enabled | bool | `true` | Deploy Bitnami MongoDB sub-chart |
+| mongodb.initdbScriptsConfigMap | string | `"initdb-scripts"` |  |
 | nameOverride | string | `""` |  |
 | nodeSelector | object | `{}` |  |
 | persistence.accessMode | string | `"ReadWriteOnce"` |  |
@@ -44,5 +61,3 @@ A Helm chart for the Unifi Controller
 | serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template |
 | tolerations | list | `[]` |  |
 
-----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)

charts/unifi-controller/templates/_helpers.tpl

@@ -60,3 +60,81 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "unifi-controller.mongodb.fullname" -}}
+{{- printf "%s-%s" .Release.Name "mongodb" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Set mongodb host
+*/}}
+{{- define "unifi-controller.mongodb.host" -}}
+{{- if .Values.mongodb.enabled -}}
+{{- template "unifi-controller.mongodb.fullname" . -}}
+{{- else -}}
+{{ required "A valid externalMongodb.host is required" .Values.externalMongodb.host }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Set mongodb secret
+*/}}
+{{- define "unifi-controller.mongodb.secret" -}}
+{{- if .Values.mongodb.enabled -}}
+{{- template "unifi-controller.mongodb.fullname" . -}}
+{{- else -}}
+{{- template "unifi-controller.fullname" . -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Set mongodb port
+*/}}
+{{- define "unifi-controller.mongodb.port" -}}
+{{- if .Values.mongodb.enabled -}}
+{{- if .Values.mongodb.service -}}
+{{- .Values.mongodb.service.port | default 27017 }}
+{{- else -}}
+5432
+{{- end -}}
+{{- else -}}
+{{- required "A valid externalMongodb.port is required" .Values.externalMongodb.port -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Set mongodb username
+*/}}
+{{- define "unifi-controller.mongodb.username" -}}
+{{- if .Values.mongodb.enabled -}}
+{{ required "A valid mongodb.auth.usernames is required" (first .Values.mongodb.auth.usernames) }}
+{{- else -}}
+{{ required "A valid externalMongodb.username is required" .Values.externalMongodb.username }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Set mongodb password
+*/}}
+{{- define "unifi-controller.mongodb.password" -}}
+{{- if .Values.mongodb.enabled -}}
+{{ required "A valid mongodb.auth.passwords is required" (first .Values.mongodb.auth.passwords) }}
+{{- else if not (and .Values.externalMongodb.existingSecret .Values.externalMongodb.existingSecretPasswordKey) -}}
+{{ required "A valid externalMongodb.password is required" .Values.externalMongodb.password }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Set mongodb database
+*/}}
+{{- define "unifi-controller.mongodb.database" -}}
+{{- if .Values.mongodb.enabled -}}
+{{- (first .Values.mongodb.auth.databases) | default "unifi" }}
+{{- else -}}
+{{ required "A valid externalMongodb.database is required" .Values.externalMongodb.database }}
+{{- end -}}
+{{- end -}}

charts/unifi-controller/templates/configmap.yaml

@@ -0,0 +1,10 @@
+{{- if .Values.mongodb.enabled -}}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: initdb-scripts
+data:
+    init-mongo.js: |
+      db = db.getSiblingDB("{{ include "unifi-controller.mongodb.database" . }}");
+      db.grantRolesToUser("{{ include "unifi-controller.mongodb.username" . }}", [{role: "dbOwner", db: "{{ include "unifi-controller.mongodb.database" . }}_stat"}])
+{{- end }}

charts/unifi-controller/templates/deployment.yaml

@@ -67,6 +67,26 @@ spec:
               value: {{ .Values.config.jvmMemory.startup }}
             - name: MEM_LIMIT
               value: {{ .Values.config.jvmMemory.limit }}
+            - name: MONGO_HOST
+              value: {{ include "unifi-controller.mongodb.host" . }}
+            - name: MONGO_PORT
+              value: {{ include "unifi-controller.mongodb.port" . | quote }}
+            - name: MONGO_USER
+              value: {{ include "unifi-controller.mongodb.username" . }}
+            {{- if or .Values.mongodb.enabled .Values.externalMongodb.existingSecret }}
+            - name: MONGO_PASS
+              valueFrom:
+                secretKeyRef:
+                  {{- if .Values.mongodb.enabled }}
+                  name: {{ .Values.mongodb.existingSecret | default (include "unifi-controller.mongodb.fullname" .) }}
+                  key: mongodb-passwords
+                  {{- else }}
+                  name: {{ .Values.externalMongodb.existingSecret }}
+                  key: {{ .Values.externalMongodb.existingSecretPasswordKey }}
+                  {{- end }}
+            {{- end }}
+            - name: MONGO_DBNAME
+              value: {{ include "unifi-controller.mongodb.database" . }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:

charts/unifi-controller/values.yaml

@@ -3,7 +3,7 @@
 # Declare variables to be passed into your templates.
 
 image:
-  repository: quay.io/linuxserver.io/unifi-controller
+  repository: lscr.io/linuxserver/unifi-network-application
   pullPolicy: IfNotPresent
   # -- Overrides the image tag whose default is the chart appVersion.
   tag: ""
@@ -56,6 +56,30 @@ service:
   combinedProtocols: true
   annotations: {}
 
+mongodb:
+  # -- Deploy Bitnami MongoDB sub-chart
+  enabled: true
+  auth:
+    rootUser: root
+    rootPassword: unifi
+    databases:
+      - unifi
+    usernames:
+      - unifi
+    passwords:
+      - unifi
+  initdbScriptsConfigMap: initdb-scripts
+
+externalMongodb:
+  # -- Use an external MongoDB database
+  enabled: false
+  # host: mongodb
+  port: 27017
+  database: unifi
+  username: unifi
+  # existingSecret: unifi-mongodb
+  # existingSecretPasswordKey: password
+
 ingress:
   enabled: false
   className: ""