Merge pull request #9 from sanderv32/unifi-fixes

unifi fixes

.github/workflows/ci.yaml

@@ -46,9 +46,10 @@ jobs:
     strategy:
       matrix:
         k8s:
-          - v1.27.10
-          - v1.28.6
-          - v1.29.1
+          - v1.28.13
+          - v1.29.8
+          - v1.30.4
+          - v1.31.0
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -69,9 +70,10 @@ jobs:
     strategy:
       matrix:
         k8s:
-          - v1.27.0
-          - v1.28.0
-          - v1.29.0
+          - v1.28.13
+          - v1.29.8
+          - v1.30.4
+          - v1.31.0
     steps:
       - name: Checkout
         uses: actions/checkout@v4

charts/unifi-network-app/Chart.yaml

@@ -1,13 +1,14 @@
 apiVersion: v2
 name: unifi-network-app
-description: A Helm chart for Kubernetes
+description: A Helm chart for Unifi Network Application
+icon: https://raw.githubusercontent.com/sanderv32/helm-charts/master/icons/ubiquity.svg
 keywords:
   - Unifi
   - Controller
   - Network
 type: application
-version: 0.1.1
-appVersion: "8.3.32"
+version: 0.2.0
+appVersion: "8.4.59"
 maintainers:
   - name: sanderv32
     email: [email protected]

charts/unifi-network-app/templates/deployment.yaml

@@ -31,34 +31,34 @@ spec:
       containers:
         - env:
           - name: MEM_LIMIT
-            value: "{{ .Values.memLimit | default "1024" }}"
+            value: "{{ .Values.memLimit }}"
           - name: MEM_STARTUP
-            value: "{{ .Values.memStartup | default "1024" }}"
+            value: "{{ .Values.memStartup }}"
           - name: MONGO_AUTHSOURCE
           - name: MONGO_DBNAME
-            value: {{ .Values.unifi.db.name | default "unifi" }}
+            value: "{{ .Values.mongodb.db_name }}"
           {{- if .Values.mongodb.enabled }}
           - name: MONGO_HOST
             value: {{ include "unifi-network-app.fullname" . }}-mongodb
-          # {{- else -}}
-          # - name: MONGO_HOST
-          #   value: {{ .Values.unifi.db.host }}
+          {{- else -}}
+          - name: MONGO_HOST
+            value: "{{ .Values.mongodb.host }}"
           {{- end }}
           - name: MONGO_PASS
-            value: {{ .Values.unifi.db.password | default "unifi" }}
+            value: "{{ .Values.mongodb.db_password }}"
           - name: MONGO_PORT
-            value: "{{ .Values.unifi.db.port | default "27017" }}"
+            value: "{{ .Values.mongodb.port }}"
           - name: MONGO_TLS
           - name: MONGO_USER
-            value: {{ .Values.unifi.db.user | default "unifi" }}
+            value: "{{ .Values.mongodb.db_user }}"
           - name: PGID
-            value: "{{ .Values.unifi.pgid | default "1000" }}"
+            value: "{{ .Values.pgid }}"
           - name: PUID
-            value: "{{ .Values.unifi.puid | default "1000" }}"
+            value: "{{ .Values.puid }}"
           - name: TZ
-            value: {{ .Values.unifi.tz | default "Etc/UTC" }}
+            value: "{{ .Values.tz }}"
 
-          name: {{ .Chart.Name }}
+          name: "{{ .Chart.Name }}"
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"

charts/unifi-network-app/templates/ingress.yaml

@@ -1,6 +1,6 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "unifi-network-app.fullname" . -}}
-{{- $svcPort := .Values.service.ports.admin.port -}}
+{{- $svcPort := (index .Values.service.ports "https-admin").port -}}
 {{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
   {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
   {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}

charts/unifi-network-app/templates/mongodb-configmap.yaml

@@ -6,6 +6,6 @@ metadata:
   labels: {{- include "unifi-network-app.labels" . | nindent 4 }}
 data:
   init-mongo.js: |-
-    db.getSiblingDB("{{ .Values.unifi.db.name }}").createUser({user: "{{ .Values.unifi.db.user }}", pwd: "{{ .Values.unifi.db.password }}", roles: [{role: "dbOwner", db: "{{ .Values.unifi.db.name }}"}]});
-    db.getSiblingDB("{{ .Values.unifi.db.name }}_stat").createUser({user: "{{ .Values.unifi.db.user }}", pwd: "{{ .Values.unifi.db.password }}", roles: [{role: "dbOwner", db: "{{ .Values.unifi.db.name }}_stat"}]});
+    db.getSiblingDB("{{ .Values.mongodb.db_name }}").createUser({user: "{{ .Values.mongodb.db_user }}", pwd: "{{ .Values.mongodb.db_password }}", roles: [{role: "dbOwner", db: "{{ .Values.mongodb.db_name }}"}]});
+    db.getSiblingDB("{{ .Values.mongodb.db_name }}_stat").createUser({user: "{{ .Values.mongodb.db_user }}", pwd: "{{ .Values.mongodb.db_password }}", roles: [{role: "dbOwner", db: "{{ .Values.mongodb.db_name }}_stat"}]});
 {{- end }}

charts/unifi-network-app/values.yaml

@@ -2,21 +2,17 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
-unifi:
-  db:
-    host: "unifi-mongodb"
-    port: 27017
-    name: "unifi"
-    user: "unifi"
-    password: "unifi"
-  memLimit: 1024
-  memStartup: 1024
-  puid: 1000
-  pgid: 1000
-  tz: "Etc/UTC"
+memLimit: 1024
+memStartup: 1024
+puid: 1000
+pgid: 1000
+tz: "Etc/UTC"
 
 mongodb:
   enabled: true
+  db_name: "unifi-mongodb"
+  db_user: "unifi"
+  db_password: "unifi"
   port: 27017
   image:
     repository: docker.io/mongo
@@ -58,10 +54,10 @@ securityContext: {}
 service:
   type: ClusterIP
   ports:
-    admin:
+    https-admin:
       port: 8443
       proto: tcp
-    inform:
+    http-inform:
       port: 8080
       proto: tcp
     stun:
@@ -73,10 +69,10 @@ service:
     discovery-l2:
       port: 1900
       proto: udp
-    guestportal-https:
+    https-guestportal:
       port: 8843
       proto: tcp
-    guestportal-http:
+    http-guestportal:
       port: 8880
       proto: tcp
     throughputtest:
@@ -87,7 +83,7 @@ service:
       proto: udp
 
 ingress:
-  enabled: false
+  enabled: true
   className: ""
   annotations: {}
   hosts:
@@ -97,7 +93,8 @@ ingress:
           pathType: ImplementationSpecific
   tls: []
 
-resources: {}
+resources:
+  {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little
   # resources, such as Minikube. If you do want to specify resources, uncomment the following