Revert "Dynamic Config Helm Changes"
This reverts commit 4ee3e3d1db290fb1c646bf49a4ffe04c0b74494b.
Reason for revert: need more review
Change-Id: Ie76d1771394ba2e582ef047c15ce3464d82b9e8c
diff --git a/omec/5g-control-plane/Chart.yaml b/omec/5g-control-plane/Chart.yaml
index 945b2cd..e569f4d 100644
--- a/omec/5g-control-plane/Chart.yaml
+++ b/omec/5g-control-plane/Chart.yaml
@@ -8,7 +8,7 @@
name: 5g-control-plane
icon: https://guide.opencord.org/logos/cord.svg
-version: 0.2.9
+version: 0.2.8
dependencies:
- name: mongodb
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 43c3582..820b6cb 100644
--- a/omec/5g-control-plane/templates/bin/_ausf-run.sh.tpl
+++ b/omec/5g-control-plane/templates/bin/_ausf-run.sh.tpl
@@ -10,6 +10,10 @@
cp /free5gc/ausf/ausf /tmp/coredump/
{{- end }}
-cat /free5gc/config/ausfcfg.conf
+cd /free5gc
+cp /tmp/config/* config/
-./free5gc/ausf/ausf -ausfcfg /free5gc/config/ausfcfg.conf
+cat config/free5GC.conf
+cat config/ausfcfg.conf
+
+./ausf/ausf -ausfcfg 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 023448e..d3205ea 100644
--- a/omec/5g-control-plane/templates/bin/_nrf-run.sh.tpl
+++ b/omec/5g-control-plane/templates/bin/_nrf-run.sh.tpl
@@ -11,8 +11,10 @@
{{- 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 f18e4d1..57f6613 100644
--- a/omec/5g-control-plane/templates/bin/_nssf-run.sh.tpl
+++ b/omec/5g-control-plane/templates/bin/_nssf-run.sh.tpl
@@ -10,6 +10,10 @@
cp /free5gc/nssf/nssf /tmp/coredump/
{{- end }}
-cat /free5gc/config/nssfcfg.conf
+cd /free5gc
+cp /tmp/config/* config/
-./free5gc/nssf/nssf -nssfcfg /free5gc/config/nssfcfg.conf
+cat config/free5GC.conf
+cat config/nssfcfg.conf
+
+./nssf/nssf -nssfcfg 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 121eb51..a758c44 100644
--- a/omec/5g-control-plane/templates/bin/_pcf-run.sh.tpl
+++ b/omec/5g-control-plane/templates/bin/_pcf-run.sh.tpl
@@ -10,6 +10,10 @@
cp /free5gc/pcf/pcf /tmp/coredump/
{{- end }}
-cat /free5gc/config/pcfcfg.conf
+cd /free5gc
+cp /tmp/config/* config/
-./free5gc/pcf/pcf -pcfcfg /free5gc/config/pcfcfg.conf
+cat config/free5GC.conf
+cat config/pcfcfg.conf
+
+./pcf/pcf -pcfcfg 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 adc5e90..9d5bcf6 100644
--- a/omec/5g-control-plane/templates/bin/_smf-run.sh.tpl
+++ b/omec/5g-control-plane/templates/bin/_smf-run.sh.tpl
@@ -11,8 +11,10 @@
{{- 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 9eaccb5..382cae4 100644
--- a/omec/5g-control-plane/templates/bin/_udm-run.sh.tpl
+++ b/omec/5g-control-plane/templates/bin/_udm-run.sh.tpl
@@ -10,6 +10,10 @@
cp /free5gc/udm/udm /tmp/coredump/
{{- end }}
-cat /free5gc/config/udmcfg.conf
+cd /free5gc
+cp /tmp/config/* config/
-./free5gc/udm/udm -udmcfg /free5gc/config/udmcfg.conf
+cat config/free5GC.conf
+cat config/udmcfg.conf
+
+./udm/udm -udmcfg 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 dda37aa..6610900 100644
--- a/omec/5g-control-plane/templates/bin/_udr-run.sh.tpl
+++ b/omec/5g-control-plane/templates/bin/_udr-run.sh.tpl
@@ -10,6 +10,10 @@
cp /free5gc/udr/udr /tmp/coredump/
{{- end }}
-cat /free5gc/config/udrcfg.conf
+cd /free5gc
+cp /tmp/config/* config/
-./free5gc/udr/udr -udrcfg /free5gc/config/udrcfg.conf
+cat config/free5GC.conf
+cat config/udrcfg.conf
+
+./udr/udr -udrcfg 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 781e223..2be21a3 100644
--- a/omec/5g-control-plane/templates/bin/_webui-run.sh.tpl
+++ b/omec/5g-control-plane/templates/bin/_webui-run.sh.tpl
@@ -10,6 +10,10 @@
cp /free5gc/webconsole/webui /tmp/coredump/
{{- end }}
-cat /free5gc/config/webuicfg.conf
+cd /free5gc
+cp /tmp/config/* config/
-./free5gc/webconsole/webconsole -webuicfg /free5gc/config/webuicfg.conf
+cat config/free5GC.conf
+cat config/webuicfg.conf
+
+./webconsole/webconsole -webuicfg config/webuicfg.conf
diff --git a/omec/5g-control-plane/templates/deployment-ausf.yaml b/omec/5g-control-plane/templates/deployment-ausf.yaml
index 8b5b601..f27c0fb 100644
--- a/omec/5g-control-plane/templates/deployment-ausf.yaml
+++ b/omec/5g-control-plane/templates/deployment-ausf.yaml
@@ -67,10 +67,14 @@
- name: run-script
mountPath: /free5gc/script/ausf-run.sh
subPath: ausf-run.sh
- - name: common-config
- mountPath: /free5gc/common
- - name: nf-config
+ - name: config-dir
mountPath: /free5gc/config
+ - name: common-config
+ mountPath: /tmp/config/free5GC.conf
+ subPath: free5GC.conf
+ - name: nf-config
+ mountPath: /tmp/config/ausfcfg.conf
+ subPath: ausfcfg.conf
{{- if .Values.config.coreDump.enabled }}
- name: coredump
mountPath: /tmp/coredump
@@ -88,6 +92,8 @@
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 03b8b95..738e1e0 100644
--- a/omec/5g-control-plane/templates/deployment-nrf.yaml
+++ b/omec/5g-control-plane/templates/deployment-nrf.yaml
@@ -63,10 +63,14 @@
- name: run-script
mountPath: /free5gc/script/nrf-run.sh
subPath: nrf-run.sh
- - name: common-config
- mountPath: /free5gc/common
- - name: nf-config
+ - name: config-dir
mountPath: /free5gc/config
+ - name: common-config
+ mountPath: /tmp/config/free5GC.conf
+ subPath: free5GC.conf
+ - name: nf-config
+ mountPath: /tmp/config/nrfcfg.conf
+ subPath: nrfcfg.conf
{{- if .Values.config.coreDump.enabled }}
- name: coredump
mountPath: /tmp/coredump
@@ -84,6 +88,8 @@
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 968ea89..f404f1a 100644
--- a/omec/5g-control-plane/templates/deployment-nssf.yaml
+++ b/omec/5g-control-plane/templates/deployment-nssf.yaml
@@ -65,10 +65,14 @@
- name: run-script
mountPath: /free5gc/script/nssf-run.sh
subPath: nssf-run.sh
- - name: common-config
- mountPath: /free5gc/common
- - name: nf-config
+ - name: config-dir
mountPath: /free5gc/config
+ - name: common-config
+ mountPath: /tmp/config/free5GC.conf
+ subPath: free5GC.conf
+ - name: nf-config
+ mountPath: /tmp/config/nssfcfg.conf
+ subPath: nssfcfg.conf
{{- if .Values.config.coreDump.enabled }}
- name: coredump
mountPath: /tmp/coredump
@@ -86,6 +90,8 @@
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 5a576f7..65c63a0 100644
--- a/omec/5g-control-plane/templates/deployment-pcf.yaml
+++ b/omec/5g-control-plane/templates/deployment-pcf.yaml
@@ -65,10 +65,14 @@
- name: run-script
mountPath: /free5gc/script/pcf-run.sh
subPath: pcf-run.sh
- - name: common-config
- mountPath: /free5gc/common
- - name: nf-config
+ - name: config-dir
mountPath: /free5gc/config
+ - name: common-config
+ mountPath: /tmp/config/free5GC.conf
+ subPath: free5GC.conf
+ - name: nf-config
+ mountPath: /tmp/config/pcfcfg.conf
+ subPath: pcfcfg.conf
{{- if .Values.config.coreDump.enabled }}
- name: coredump
mountPath: /tmp/coredump
@@ -86,6 +90,8 @@
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 f4601fa..81b2acf 100644
--- a/omec/5g-control-plane/templates/deployment-smf.yaml
+++ b/omec/5g-control-plane/templates/deployment-smf.yaml
@@ -67,10 +67,17 @@
- name: run-script
mountPath: /free5gc/script/smf-run.sh
subPath: smf-run.sh
- - name: common-config
- mountPath: /free5gc/common
- - name: nf-config
+ - name: config-dir
mountPath: /free5gc/config
+ - name: common-config
+ mountPath: /tmp/config/free5GC.conf
+ subPath: free5GC.conf
+ - name: nf-config
+ mountPath: /tmp/config/uerouting.conf
+ subPath: uerouting.conf
+ - name: nf-config
+ mountPath: /tmp/config/smfcfg.conf
+ subPath: smfcfg.conf
{{- if .Values.config.coreDump.enabled }}
- name: coredump
mountPath: /tmp/coredump
@@ -88,6 +95,8 @@
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 4ea4e46..1107ea1 100644
--- a/omec/5g-control-plane/templates/deployment-udm.yaml
+++ b/omec/5g-control-plane/templates/deployment-udm.yaml
@@ -69,10 +69,14 @@
- name: run-script
mountPath: /free5gc/script/udm-run.sh
subPath: udm-run.sh
- - name: common-config
- mountPath: /free5gc/common
- - name: nf-config
+ - name: config-dir
mountPath: /free5gc/config
+ - name: common-config
+ mountPath: /tmp/config/free5GC.conf
+ subPath: free5GC.conf
+ - name: nf-config
+ mountPath: /tmp/config/udmcfg.conf
+ subPath: udmcfg.conf
{{- 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 0019d46..0d55e37 100644
--- a/omec/5g-control-plane/templates/deployment-udr.yaml
+++ b/omec/5g-control-plane/templates/deployment-udr.yaml
@@ -68,9 +68,10 @@
- name: config-dir
mountPath: /free5gc/config
- name: common-config
- mountPath: /free5gc/common
+ mountPath: /tmp/config/free5GC.conf
+ subPath: free5GC.conf
- name: nf-config
- mountPath: /free5gc/config
+ mountPath: /tmp/config/udrcfg.conf
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 181af16..6c554ec 100644
--- a/omec/5g-control-plane/templates/deployment-webui.yaml
+++ b/omec/5g-control-plane/templates/deployment-webui.yaml
@@ -62,9 +62,11 @@
- name: config-dir
mountPath: /free5gc/config
- name: common-config
- mountPath: /free5gc/config
+ mountPath: /tmp/config/free5GC.conf
+ subPath: free5GC.conf
- name: nf-config
- mountPath: /free5gc/config
+ mountPath: /tmp/config/webuicfg.conf
+ subPath: webuicfg.conf
{{- if .Values.config.coreDump.enabled }}
- name: coredump
mountPath: /tmp/coredump