commit 6a65148162a0daedd4cd804a493323b6a25741cf
author Hyunsun Moon <hyunsun.moon@gmail.com> Fri Feb 26 01:46:44 2021 -0800
committer Hyunsun Moon <hyunsun@opennetworking.org> Tue Mar 02 01:53:59 2021 +0000
tree 6ed6f07d9d08ae2a5c6ce55a95bd762def12505b
parent c62576a744a25eed46e583c1c764377339e80d81

AETHER-1342 Improve 5gc-control-plane helm chart

- Add image pull secrets support
- Use Bitnami chart repo for MongoDB
- Use Deployment instead of Statefulset for the core components
- Add Ingress for WebUI
- Consolidate common configs to a single configmap
- Configure mongodb URL and name in a single place
- Remove unncessary test configs from default values
- Fix hard-coded URLs configurable
- Hide POD_IP from default values and enable auto-set

Change-Id: I58c9925cd8f3892ed59c386278d9ea5359e6b013

omec/5g-control-plane/templates/deployment-webui.yaml

diff --git a/omec/5g-control-plane/templates/deployment-webui.yaml b/omec/5g-control-plane/templates/deployment-webui.yaml
index a01138e..6c554ec 100644
--- a/omec/5g-control-plane/templates/deployment-webui.yaml
+++ b/omec/5g-control-plane/templates/deployment-webui.yaml
@@ -27,20 +27,16 @@
         {{- toYaml . | nindent 8 }}
     {{- end }}
     spec:
-    {{- if .Values.nodeSelectors.enabled }}
-      nodeSelector:
-        {{ .Values.nodeSelectors.webui.label }}: {{ .Values.nodeSelectors.webui.value }}
-    {{- end }}
       serviceAccountName: webui
-    {{- if .Values.images.credentials }}
+    {{- if hasKey .Values.images "pullSecrets" }}
       imagePullSecrets:
-        - name: {{ .Release.Name }}.registry
+{{ toYaml .Values.images.pullSecrets | indent 8 }}
     {{- end }}
       initContainers:
-      - name: wait-nrf-module
+      - name: wait-webui-module
         image: {{ .Values.images.tags.init | quote }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
-        command: ['sh', '-c', 'until nslookup nrf; do echo waiting for nrf; sleep 4; done;']
+        command: ['sh', '-c', 'until nslookup webui; do echo waiting for webui; sleep 4; done;']
     {{- if .Values.config.coreDump.enabled }}
 {{ tuple "webui" . | include "5g-control-plane.coredump_init" | indent 6 }}
     {{- end }}
@@ -54,30 +50,42 @@
       {{- end }}
         stdin: true
         tty: true
-        command: ["/opt/cp/scripts/webui-run.sh"]
+        command: ["/free5gc/script/webui-run.sh"]
       {{- if .Values.resources.enabled }}
         resources:
 {{ toYaml .Values.resources.webui | indent 10 }}
       {{- end }}
         volumeMounts:
-        - name: cp-script
-          mountPath: /opt/cp/scripts/webui-run.sh
+        - name: run-script
+          mountPath: /free5gc/script/webui-run.sh
           subPath: webui-run.sh
-        - name: cp-config
+        - name: config-dir
           mountPath: /free5gc/config
+        - name: common-config
+          mountPath: /tmp/config/free5GC.conf
+          subPath: free5GC.conf
+        - name: nf-config
+          mountPath: /tmp/config/webuicfg.conf
+          subPath: webuicfg.conf
       {{- if .Values.config.coreDump.enabled }}
         - name: coredump
           mountPath: /tmp/coredump
       {{- end }}
       volumes:
-      - name: cp-script
+      - name: run-script
         configMap:
           name: webui
           defaultMode: 493
-      - name: cp-config
+      - name: common-config
+        configMap:
+          name: common
+          defaultMode: 493 
+      - name: nf-config
         configMap:
           name: webui
-          defaultMode: 420
+          defaultMode: 493
+      - name: config-dir
+        emptyDir: {}
     {{- if .Values.config.coreDump.enabled }}
       - name: host-rootfs
         hostPath: