running amf exeecutable in bash to receive SIGTERM signal on graceful shutdown of the pod
Change-Id: I6546626024bac06d7d26df860a901078ff48cfbf
diff --git a/5g-control-plane/Chart.yaml b/5g-control-plane/Chart.yaml
index 29b1747..421e7e5 100644
--- a/5g-control-plane/Chart.yaml
+++ b/5g-control-plane/Chart.yaml
@@ -10,7 +10,7 @@
name: 5g-control-plane
icon: https://guide.opencord.org/logos/cord.svg
-version: 0.7.9
+version: 0.7.10
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 45a6712..8c057cb 100644
--- a/5g-control-plane/templates/bin/_amf-run.sh.tpl
+++ b/5g-control-plane/templates/bin/_amf-run.sh.tpl
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# Copyright 2020-present Open Networking Foundation
#
@@ -14,4 +14,4 @@
cd $IMGPATH
cat config/amfcfg.conf
-GOTRACEBACK=crash ./amf/amf -amfcfg 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 3855b63..a43e695 100644
--- a/5g-control-plane/templates/deployment-amf.yaml
+++ b/5g-control-plane/templates/deployment-amf.yaml
@@ -32,14 +32,6 @@
imagePullSecrets:
{{ toYaml .Values.images.pullSecrets | indent 8 }}
{{- end }}
- initContainers:
- - name: wait-nrf-module
- image: {{ .Values.images.repository }}{{ .Values.images.tags.init }}
- imagePullPolicy: {{ .Values.images.pullPolicy }}
- command: ['sh', '-c', 'until nslookup nrf; do echo waiting for nrf; sleep 4; done;']
- {{- if .Values.config.coreDump.enabled }}
-{{ tuple "amf" . | include "5g-control-plane.coredump_init" | indent 6 }}
- {{- end }}
containers:
- name: amf
image: {{ .Values.images.repository }}{{ .Values.images.tags.amf }}
@@ -51,6 +43,9 @@
stdin: true
tty: true
command: [ {{ .Values.config.imagePath }}/script/amf-run.sh ]
+ command: [ "/bin/bash", "-c" ]
+ args:
+ - "cat {{ .Values.config.imagePath }}/config/amfcfg.conf && GOTRACEBACK=crash {{ .Values.config.imagePath }}/amf/amf -amfcfg {{ .Values.config.imagePath }}/config/amfcfg.conf"
env:
- name: GRPC_GO_LOG_VERBOSITY_LEVEL
value: {{ .Values.config.grpc.golog_verbosity | quote }}