Dynamic Config Helm Changes
Change-Id: I5e59ea542bfeb7278781cd5efedeae0b44d97999
diff --git a/omec/5g-control-plane/templates/bin/_ausf-run.sh.tpl b/omec/5g-control-plane/templates/bin/_ausf-run.sh.tpl
index 820b6cb..43c3582 100644
--- a/omec/5g-control-plane/templates/bin/_ausf-run.sh.tpl
+++ b/omec/5g-control-plane/templates/bin/_ausf-run.sh.tpl
@@ -10,10 +10,6 @@
cp /free5gc/ausf/ausf /tmp/coredump/
{{- end }}
-cd /free5gc
-cp /tmp/config/* config/
+cat /free5gc/config/ausfcfg.conf
-cat config/free5GC.conf
-cat config/ausfcfg.conf
-
-./ausf/ausf -ausfcfg config/ausfcfg.conf
+./free5gc/ausf/ausf -ausfcfg /free5gc/config/ausfcfg.conf
diff --git a/omec/5g-control-plane/templates/bin/_nrf-run.sh.tpl b/omec/5g-control-plane/templates/bin/_nrf-run.sh.tpl
index d3205ea..023448e 100644
--- a/omec/5g-control-plane/templates/bin/_nrf-run.sh.tpl
+++ b/omec/5g-control-plane/templates/bin/_nrf-run.sh.tpl
@@ -11,10 +11,8 @@
{{- end }}
cd /free5gc
-cp /tmp/config/* config/
sed -i "s/POD_IP/${POD_IP}/g" config/nrfcfg.conf
-cat config/free5GC.conf
cat config/nrfcfg.conf
./nrf/nrf -nrfcfg config/nrfcfg.conf
diff --git a/omec/5g-control-plane/templates/bin/_nssf-run.sh.tpl b/omec/5g-control-plane/templates/bin/_nssf-run.sh.tpl
index 57f6613..f18e4d1 100644
--- a/omec/5g-control-plane/templates/bin/_nssf-run.sh.tpl
+++ b/omec/5g-control-plane/templates/bin/_nssf-run.sh.tpl
@@ -10,10 +10,6 @@
cp /free5gc/nssf/nssf /tmp/coredump/
{{- end }}
-cd /free5gc
-cp /tmp/config/* config/
+cat /free5gc/config/nssfcfg.conf
-cat config/free5GC.conf
-cat config/nssfcfg.conf
-
-./nssf/nssf -nssfcfg config/nssfcfg.conf
+./free5gc/nssf/nssf -nssfcfg /free5gc/config/nssfcfg.conf
diff --git a/omec/5g-control-plane/templates/bin/_pcf-run.sh.tpl b/omec/5g-control-plane/templates/bin/_pcf-run.sh.tpl
index a758c44..121eb51 100644
--- a/omec/5g-control-plane/templates/bin/_pcf-run.sh.tpl
+++ b/omec/5g-control-plane/templates/bin/_pcf-run.sh.tpl
@@ -10,10 +10,6 @@
cp /free5gc/pcf/pcf /tmp/coredump/
{{- end }}
-cd /free5gc
-cp /tmp/config/* config/
+cat /free5gc/config/pcfcfg.conf
-cat config/free5GC.conf
-cat config/pcfcfg.conf
-
-./pcf/pcf -pcfcfg config/pcfcfg.conf
+./free5gc/pcf/pcf -pcfcfg /free5gc/config/pcfcfg.conf
diff --git a/omec/5g-control-plane/templates/bin/_smf-run.sh.tpl b/omec/5g-control-plane/templates/bin/_smf-run.sh.tpl
index 9d5bcf6..adc5e90 100644
--- a/omec/5g-control-plane/templates/bin/_smf-run.sh.tpl
+++ b/omec/5g-control-plane/templates/bin/_smf-run.sh.tpl
@@ -11,10 +11,8 @@
{{- end }}
cd /free5gc
-cp /tmp/config/* config/
sed -i "s/POD_IP/${POD_IP}/g" config/smfcfg.conf
-cat config/free5GC.conf
cat config/smfcfg.conf
cat config/uerouting.conf
diff --git a/omec/5g-control-plane/templates/bin/_udm-run.sh.tpl b/omec/5g-control-plane/templates/bin/_udm-run.sh.tpl
index 382cae4..9eaccb5 100644
--- a/omec/5g-control-plane/templates/bin/_udm-run.sh.tpl
+++ b/omec/5g-control-plane/templates/bin/_udm-run.sh.tpl
@@ -10,10 +10,6 @@
cp /free5gc/udm/udm /tmp/coredump/
{{- end }}
-cd /free5gc
-cp /tmp/config/* config/
+cat /free5gc/config/udmcfg.conf
-cat config/free5GC.conf
-cat config/udmcfg.conf
-
-./udm/udm -udmcfg config/udmcfg.conf
+./free5gc/udm/udm -udmcfg /free5gc/config/udmcfg.conf
diff --git a/omec/5g-control-plane/templates/bin/_udr-run.sh.tpl b/omec/5g-control-plane/templates/bin/_udr-run.sh.tpl
index 6610900..dda37aa 100644
--- a/omec/5g-control-plane/templates/bin/_udr-run.sh.tpl
+++ b/omec/5g-control-plane/templates/bin/_udr-run.sh.tpl
@@ -10,10 +10,6 @@
cp /free5gc/udr/udr /tmp/coredump/
{{- end }}
-cd /free5gc
-cp /tmp/config/* config/
+cat /free5gc/config/udrcfg.conf
-cat config/free5GC.conf
-cat config/udrcfg.conf
-
-./udr/udr -udrcfg config/udrcfg.conf
+./free5gc/udr/udr -udrcfg /free5gc/config/udrcfg.conf
diff --git a/omec/5g-control-plane/templates/bin/_webui-run.sh.tpl b/omec/5g-control-plane/templates/bin/_webui-run.sh.tpl
index 2be21a3..781e223 100644
--- a/omec/5g-control-plane/templates/bin/_webui-run.sh.tpl
+++ b/omec/5g-control-plane/templates/bin/_webui-run.sh.tpl
@@ -10,10 +10,6 @@
cp /free5gc/webconsole/webui /tmp/coredump/
{{- end }}
-cd /free5gc
-cp /tmp/config/* config/
+cat /free5gc/config/webuicfg.conf
-cat config/free5GC.conf
-cat config/webuicfg.conf
-
-./webconsole/webconsole -webuicfg config/webuicfg.conf
+./free5gc/webconsole/webconsole -webuicfg /free5gc/config/webuicfg.conf
diff --git a/omec/5g-control-plane/templates/deployment-ausf.yaml b/omec/5g-control-plane/templates/deployment-ausf.yaml
index f27c0fb..8b5b601 100644
--- a/omec/5g-control-plane/templates/deployment-ausf.yaml
+++ b/omec/5g-control-plane/templates/deployment-ausf.yaml
@@ -67,14 +67,10 @@
- name: run-script
mountPath: /free5gc/script/ausf-run.sh
subPath: ausf-run.sh
- - name: config-dir
- mountPath: /free5gc/config
- name: common-config
- mountPath: /tmp/config/free5GC.conf
- subPath: free5GC.conf
+ mountPath: /free5gc/common
- name: nf-config
- mountPath: /tmp/config/ausfcfg.conf
- subPath: ausfcfg.conf
+ mountPath: /free5gc/config
{{- if .Values.config.coreDump.enabled }}
- name: coredump
mountPath: /tmp/coredump
@@ -92,8 +88,6 @@
configMap:
name: ausf
defaultMode: 493
- - name: config-dir
- emptyDir: {}
{{- if .Values.config.coreDump.enabled }}
- name: host-rootfs
hostPath:
diff --git a/omec/5g-control-plane/templates/deployment-nrf.yaml b/omec/5g-control-plane/templates/deployment-nrf.yaml
index 738e1e0..03b8b95 100644
--- a/omec/5g-control-plane/templates/deployment-nrf.yaml
+++ b/omec/5g-control-plane/templates/deployment-nrf.yaml
@@ -63,14 +63,10 @@
- name: run-script
mountPath: /free5gc/script/nrf-run.sh
subPath: nrf-run.sh
- - name: config-dir
- mountPath: /free5gc/config
- name: common-config
- mountPath: /tmp/config/free5GC.conf
- subPath: free5GC.conf
+ mountPath: /free5gc/common
- name: nf-config
- mountPath: /tmp/config/nrfcfg.conf
- subPath: nrfcfg.conf
+ mountPath: /free5gc/config
{{- if .Values.config.coreDump.enabled }}
- name: coredump
mountPath: /tmp/coredump
@@ -88,8 +84,6 @@
configMap:
name: nrf
defaultMode: 493
- - name: config-dir
- emptyDir: {}
{{- if .Values.config.coreDump.enabled }}
- name: host-rootfs
hostPath:
diff --git a/omec/5g-control-plane/templates/deployment-nssf.yaml b/omec/5g-control-plane/templates/deployment-nssf.yaml
index f404f1a..968ea89 100644
--- a/omec/5g-control-plane/templates/deployment-nssf.yaml
+++ b/omec/5g-control-plane/templates/deployment-nssf.yaml
@@ -65,14 +65,10 @@
- name: run-script
mountPath: /free5gc/script/nssf-run.sh
subPath: nssf-run.sh
- - name: config-dir
- mountPath: /free5gc/config
- name: common-config
- mountPath: /tmp/config/free5GC.conf
- subPath: free5GC.conf
+ mountPath: /free5gc/common
- name: nf-config
- mountPath: /tmp/config/nssfcfg.conf
- subPath: nssfcfg.conf
+ mountPath: /free5gc/config
{{- if .Values.config.coreDump.enabled }}
- name: coredump
mountPath: /tmp/coredump
@@ -90,8 +86,6 @@
configMap:
name: nssf
defaultMode: 493
- - name: config-dir
- emptyDir: {}
{{- if .Values.config.coreDump.enabled }}
- name: host-rootfs
hostPath:
diff --git a/omec/5g-control-plane/templates/deployment-pcf.yaml b/omec/5g-control-plane/templates/deployment-pcf.yaml
index 65c63a0..5a576f7 100644
--- a/omec/5g-control-plane/templates/deployment-pcf.yaml
+++ b/omec/5g-control-plane/templates/deployment-pcf.yaml
@@ -65,14 +65,10 @@
- name: run-script
mountPath: /free5gc/script/pcf-run.sh
subPath: pcf-run.sh
- - name: config-dir
- mountPath: /free5gc/config
- name: common-config
- mountPath: /tmp/config/free5GC.conf
- subPath: free5GC.conf
+ mountPath: /free5gc/common
- name: nf-config
- mountPath: /tmp/config/pcfcfg.conf
- subPath: pcfcfg.conf
+ mountPath: /free5gc/config
{{- if .Values.config.coreDump.enabled }}
- name: coredump
mountPath: /tmp/coredump
@@ -90,8 +86,6 @@
configMap:
name: pcf
defaultMode: 493
- - name: config-dir
- emptyDir: {}
{{- if .Values.config.coreDump.enabled }}
- name: host-rootfs
hostPath:
diff --git a/omec/5g-control-plane/templates/deployment-smf.yaml b/omec/5g-control-plane/templates/deployment-smf.yaml
index 81b2acf..f4601fa 100644
--- a/omec/5g-control-plane/templates/deployment-smf.yaml
+++ b/omec/5g-control-plane/templates/deployment-smf.yaml
@@ -67,17 +67,10 @@
- name: run-script
mountPath: /free5gc/script/smf-run.sh
subPath: smf-run.sh
- - name: config-dir
- mountPath: /free5gc/config
- name: common-config
- mountPath: /tmp/config/free5GC.conf
- subPath: free5GC.conf
+ mountPath: /free5gc/common
- name: nf-config
- mountPath: /tmp/config/uerouting.conf
- subPath: uerouting.conf
- - name: nf-config
- mountPath: /tmp/config/smfcfg.conf
- subPath: smfcfg.conf
+ mountPath: /free5gc/config
{{- if .Values.config.coreDump.enabled }}
- name: coredump
mountPath: /tmp/coredump
@@ -95,8 +88,6 @@
configMap:
name: smf
defaultMode: 493
- - name: config-dir
- emptyDir: {}
{{- if .Values.config.coreDump.enabled }}
- name: host-rootfs
hostPath:
diff --git a/omec/5g-control-plane/templates/deployment-udm.yaml b/omec/5g-control-plane/templates/deployment-udm.yaml
index 1107ea1..4ea4e46 100644
--- a/omec/5g-control-plane/templates/deployment-udm.yaml
+++ b/omec/5g-control-plane/templates/deployment-udm.yaml
@@ -69,14 +69,10 @@
- name: run-script
mountPath: /free5gc/script/udm-run.sh
subPath: udm-run.sh
- - name: config-dir
- mountPath: /free5gc/config
- name: common-config
- mountPath: /tmp/config/free5GC.conf
- subPath: free5GC.conf
+ mountPath: /free5gc/common
- name: nf-config
- mountPath: /tmp/config/udmcfg.conf
- subPath: udmcfg.conf
+ mountPath: /free5gc/config
{{- if .Values.config.coreDump.enabled }}
- name: coredump
mountPath: /tmp/coredump
diff --git a/omec/5g-control-plane/templates/deployment-udr.yaml b/omec/5g-control-plane/templates/deployment-udr.yaml
index 0d55e37..0019d46 100644
--- a/omec/5g-control-plane/templates/deployment-udr.yaml
+++ b/omec/5g-control-plane/templates/deployment-udr.yaml
@@ -68,10 +68,9 @@
- name: config-dir
mountPath: /free5gc/config
- name: common-config
- mountPath: /tmp/config/free5GC.conf
- subPath: free5GC.conf
+ mountPath: /free5gc/common
- name: nf-config
- mountPath: /tmp/config/udrcfg.conf
+ mountPath: /free5gc/config
subPath: udrcfg.conf
{{- if .Values.config.coreDump.enabled }}
- name: coredump
diff --git a/omec/5g-control-plane/templates/deployment-webui.yaml b/omec/5g-control-plane/templates/deployment-webui.yaml
index 6c554ec..181af16 100644
--- a/omec/5g-control-plane/templates/deployment-webui.yaml
+++ b/omec/5g-control-plane/templates/deployment-webui.yaml
@@ -62,11 +62,9 @@
- name: config-dir
mountPath: /free5gc/config
- name: common-config
- mountPath: /tmp/config/free5GC.conf
- subPath: free5GC.conf
+ mountPath: /free5gc/config
- name: nf-config
- mountPath: /tmp/config/webuicfg.conf
- subPath: webuicfg.conf
+ mountPath: /free5gc/config
{{- if .Values.config.coreDump.enabled }}
- name: coredump
mountPath: /tmp/coredump