Merge pull request #19 from Gradiant/feature-open5gs

fix open5gs-webui init time

charts/open5gs/Chart.yaml

@@ -10,7 +10,7 @@ maintainers:
 - email: [email protected]
   name: cgiraldo
 name: open5gs
-version: 0.3.2
+version: 0.3.3
 keywords:
   - epc
   - ngc

charts/open5gs/resources/add_admin.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+echo "add admin user with password 1423 if no users"
+
+cat << EOF > /tmp/account.js
+db = db.getSiblingDB('open5gs')
+cursor = db.accounts.find()
+if ( cursor.count() == 0 ) {
+    db.accounts.insert({ salt: 'f5c15fa72622d62b6b790aa8569b9339729801ab8bda5d13997b5db6bfc1d997', hash: '402223057db5194899d2e082aeb0802f6794622e1cbc47529c419e5a603f2cc592074b4f3323b239ffa594c8b756d5c70a4e1f6ecd3f9f0d2d7328c4cf8b1b766514effff0350a90b89e21eac54cd4497a169c0c7554a0e2cd9b672e5414c323f76b8559bc768cba11cad2ea3ae704fb36abc8abc2619231ff84ded60063c6e1554a9777a4a464ef9cfdfa90ecfdacc9844e0e3b2f91b59d9ff024aec4ea1f51b703a31cda9afb1cc2c719a09cee4f9852ba3cf9f07159b1ccf8133924f74df770b1a391c19e8d67ffdcbbef4084a3277e93f55ac60d80338172b2a7b3f29cfe8a36738681794f7ccbe9bc98f8cdeded02f8a4cd0d4b54e1d6ba3d11792ee0ae8801213691848e9c5338e39485816bb0f734b775ac89f454ef90992003511aa8cceed58a3ac2c3814f14afaaed39cbaf4e2719d7213f81665564eec02f60ede838212555873ef742f6666cc66883dcb8281715d5c762fb236d72b770257e7e8d86c122bb69028a34cf1ed93bb973b440fa89a23604cd3fefe85fbd7f55c9b71acf6ad167228c79513f5cfe899a2e2cc498feb6d2d2f07354a17ba74cecfbda3e87d57b147e17dcc7f4c52b802a8e77f28d255a6712dcdc1519e6ac9ec593270bfcf4c395e2531a271a841b1adefb8516a07136b0de47c7fd534601b16f0f7a98f1dbd31795feb97da59e1d23c08461cf37d6f2877d0f2e437f07e25015960f63', username: 'admin', roles: [ 'admin' ], "__v" : 0})
+}
+EOF
+
+mongo $DB_URI /tmp/account.js
+rm -f /tmp/account.js

charts/open5gs/templates/webui-configmap.yaml

@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "common.names.fullname" . }}-webui
+  labels: {{- include "common.labels.standard" . | nindent 4 }}
+    app.kubernetes.io/component: webui
+data:
+  add_admin.sh: |-
+{{ tpl (.Files.Get "resources/add_admin.sh") . | indent 4 }}

charts/open5gs/templates/webui-deployment.yaml

@@ -15,6 +15,23 @@ spec:
         app.kubernetes.io/component: webui
     spec:
 {{ include "open5gs.imagePullSecrets" . | indent 6 }}
+      initContainers:
+      - name: init
+        image: bitnami/mongodb:4.4.1-debian-10-r39
+        env:
+        - name: DB_URI
+          {{- if not .Values.db_uri }}
+          value: mongodb://{{ .Release.Name }}-mongodb/open5gs
+          {{- else }}
+          value:  {{ .Values.db_uri }}
+          {{- end  }}
+        command: 
+          - /bin/bash
+          - /add_admin.sh
+        volumeMounts:
+        - name: populate
+          mountPath: /add_admin.sh
+          subPath: add_admin.sh
       containers:
       - name: webui
         image: {{ template "open5gs.webui.image" . }}
@@ -30,18 +47,16 @@ spec:
         - name: http
           containerPort: 3000
           protocol: TCP
-        readinessProbe:
-          httpGet:
-            path: /                                                   
-            port: http
-          initialDelaySeconds: 5
-          periodSeconds: 5
         livenessProbe:
           httpGet:
             path: /                                                   
             port: http
-          initialDelaySeconds: 5
-          periodSeconds: 5
+          initialDelaySeconds: 60
+          periodSeconds: 15
         resources:
 {{ toYaml .Values.webui.resources | indent 10 }}
       terminationGracePeriodSeconds: 0
+      volumes:
+      - name: populate
+        configMap:
+          name: {{ include "common.names.fullname" . }}-webui