update default path to omec-project instead of free5gc
Change-Id: I8b13247ae65131bf8bc469d106c4d849fdf9dc5b
diff --git a/5g-control-plane/Chart.yaml b/5g-control-plane/Chart.yaml
index 1db7de8..8b7795d 100644
--- a/5g-control-plane/Chart.yaml
+++ b/5g-control-plane/Chart.yaml
@@ -8,7 +8,7 @@
name: 5g-control-plane
icon: https://guide.opencord.org/logos/cord.svg
-version: 0.6.1
+version: 0.6.2
dependencies:
- name: mongodb
diff --git a/5g-control-plane/templates/bin/_amf-run.sh.tpl b/5g-control-plane/templates/bin/_amf-run.sh.tpl
index 2a9d174..ce0d310 100644
--- a/5g-control-plane/templates/bin/_amf-run.sh.tpl
+++ b/5g-control-plane/templates/bin/_amf-run.sh.tpl
@@ -6,11 +6,12 @@
set -xe
+IMGPATH={{ .Values.config.imagePath }}
{{- if .Values.config.coreDump.enabled }}
-cp /free5gc/amf/amf /tmp/coredump/
+cp $IMGPATH/amf/amf /tmp/coredump/
{{- end }}
-cd /free5gc
+cd $IMGPATH
cat config/amfcfg.conf
GOTRACEBACK=crash ./amf/amf -amfcfg config/amfcfg.conf
diff --git a/5g-control-plane/templates/deployment-amf.yaml b/5g-control-plane/templates/deployment-amf.yaml
index 05aa29c..a6e7cc5 100644
--- a/5g-control-plane/templates/deployment-amf.yaml
+++ b/5g-control-plane/templates/deployment-amf.yaml
@@ -3,7 +3,6 @@
# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
*/}}
-
{{- if .Values.config.amf.deploy }}
{{ tuple "amf" . | include "5g-control-plane.service_account" }}
---
@@ -51,7 +50,7 @@
{{- end }}
stdin: true
tty: true
- command: ["/free5gc/script/amf-run.sh"]
+ command: [ {{ .Values.config.imagePath }}/script/amf-run.sh ]
env:
- name: GRPC_GO_LOG_VERBOSITY_LEVEL
value: {{ .Values.config.grpc.golog_verbosity | quote }}
@@ -75,10 +74,10 @@
{{- end }}
volumeMounts:
- name: run-script
- mountPath: /free5gc/script/amf-run.sh
+ mountPath: {{ .Values.config.imagePath }}/script/amf-run.sh
subPath: amf-run.sh
- name: amf-config
- mountPath: /free5gc/config
+ mountPath: {{ .Values.config.imagePath }}/config
{{- if .Values.config.coreDump.enabled }}
- name: coredump
mountPath: /tmp/coredump
diff --git a/5g-control-plane/values.yaml b/5g-control-plane/values.yaml
index b84c25c..7809e17 100644
--- a/5g-control-plane/values.yaml
+++ b/5g-control-plane/values.yaml
@@ -104,6 +104,7 @@
enabled: false # helm chart config and use the config from config Pod
syncUrl: "" # Get the config from adapater in case control plane is down
useExistingConfigMap: false
+ imagePath: /free5gc
coreDump:
enabled: false
path: /tmp/coredump