commit aec2a1ccbac2ff3f324ae7567af77e95ae5797ec
author Ajay Lotan Thakur <thakur.ajay@gmail.com> Wed Mar 31 20:18:17 2021 -0500
committer Ajay Thakur <thakur.ajay@gmail.com> Thu Apr 01 14:04:04 2021 +0000
tree fe6d50f71eab2ab5526ca6e16a7980b78b5e09be
parent 5bd8d1b469a79bb53360e862234eb80368ebea2b

Helm Chart cleanup for spgw. Removal of dpdk related parameters,
config files are removed.

Change-Id: Ib347afb5c37bea11b39aac555b1dc4a1d177e848

omec/omec-control-plane/templates/bin/_spgwc-run.sh.tpl

diff --git a/omec/omec-control-plane/templates/bin/_spgwc-run.sh.tpl b/omec/omec-control-plane/templates/bin/_spgwc-run.sh.tpl
index b7f6cb0..fd1096d 100644
--- a/omec/omec-control-plane/templates/bin/_spgwc-run.sh.tpl
+++ b/omec/omec-control-plane/templates/bin/_spgwc-run.sh.tpl
@@ -9,22 +9,18 @@
 
 mkdir -p /opt/cp/config
 cd /opt/cp/config
-cp /etc/cp/config/{*.cfg,*.json,*.conf} .
+cp /etc/cp/config/{*.json,*.conf} .
 
 case $APPLICATION in
     "ngic_controlplane")
       echo "Starting ngic controlplane app"
-      if [ ! -d "/dev/hugepages" ]; then
-          MEMORY="--no-huge -m $((MEM_LIMIT-1024))"
-      fi
-      CORES="-c $(taskset -p $$ | awk '{print $NF}')"
-      EAL_ARGS="${CORES} ${MEMORY} --no-pci"
+      cat /opt/cp/config/cp.json
       cat /opt/cp/config/subscriber_mapping.json
       {{- if .Values.config.coreDump.enabled }}
       cp /bin/ngic_controlplane /tmp/coredump/
       {{- end }}
 
-      ngic_controlplane $EAL_ARGS -- -f /etc/cp/config/
+      ngic_controlplane -f /etc/cp/config/
       ;;
 
     "gx-app")

omec/omec-control-plane/templates/configmap-spgwc.yaml

diff --git a/omec/omec-control-plane/templates/configmap-spgwc.yaml b/omec/omec-control-plane/templates/configmap-spgwc.yaml
index 645bfff..2c3fe54 100644
--- a/omec/omec-control-plane/templates/configmap-spgwc.yaml
+++ b/omec/omec-control-plane/templates/configmap-spgwc.yaml
@@ -38,45 +38,6 @@
   labels:
 {{ tuple "spgwc" . | include "omec-control-plane.metadata_labels" | indent 4 }}
 data:
-  cp.cfg: |
-    [GLOBAL]
-    CP_TYPE = 03
-    GX_CONFIG = {{ .Values.config.spgwc.global.gx_config }}
-    URR_CONFIG = {{ .Values.config.spgwc.global.urr_config }}
-    LOGGING_LEVEL = {{ .Values.config.spgwc.global.logging_level}}
-    S5S8_PORT = 2123
-    UPF_PFCP_PORT = 8805
-    S11_PORT = {{ .Values.config.spgwc.s11.port }}
-    PFCP_PORT = {{ .Values.config.spgwc.n4.port }}
-    PROMETHEUS_PORT = {{ .Values.config.spgwc.prometheus.port }}
-    HTTP_PORT = {{ .Values.config.spgwc.rest.port }}
-    TRANSMIT_TIMER = {{ .Values.config.spgwc.global.transmitTimerSec }}
-    PERIODIC_TIMER = {{ .Values.config.spgwc.global.periodicTimerSec }}
-    TRANSMIT_COUNT = {{ .Values.config.spgwc.global.transmitCount }}
-    REQUEST_TIMEOUT = {{ .Values.config.spgwc.global.requestTimeoutMilliSec }}
-    REQUEST_TRIES = {{ .Values.config.spgwc.global.requestTries }}
-    CP_LOGGER = {{ .Values.config.spgwc.global.cpLogger }}
-    [NAMESERVER_CONFIG]
-    [CACHE]
-    concurrent = {{ .Values.config.spgwc.dns.cache.concurrent }}
-    percentage = {{ .Values.config.spgwc.dns.cache.percentage }}
-    interval_seconds = {{ .Values.config.spgwc.dns.cache.intervalSec }}
-    query_timeout_ms = {{ .Values.config.spgwc.dns.cache.queryTimeoutMilliSec }}
-    query_tries = {{ .Values.config.spgwc.dns.cache.queryTries }}
-    [APP]
-    frequency_seconds = {{ .Values.config.spgwc.dns.app.frequencySec }}
-    filename = {{ .Values.config.spgwc.dns.app.filename }}
-    nameserver = {{ .Values.config.spgwc.dns.app.nameserver }}
-    [OPS]
-    frequency_seconds = {{ .Values.config.spgwc.dns.ops.frequencySec }}
-    filename = {{ .Values.config.spgwc.dns.ops.filename }}
-    nameserver = {{ .Values.config.spgwc.dns.ops.nameserver }}
-    [IP_POOL_CONFIG]
-    IP_POOL_IP= {{.Values.config.spgwc.ueIpPool.ip }}
-    IP_POOL_MASK= {{ .Values.config.spgwc.ueIpPool.mask }}
-    [STATIC_IP_POOL_CONFIG]
-    IP_POOL_IP= {{.Values.config.spgwc.staticUeIpPool.ip }}
-    IP_POOL_MASK= {{ .Values.config.spgwc.staticUeIpPool.mask }}
   gx.conf: |
     Identity = {{ tuple "spgwc" "identity" . | include "omec-control-plane.diameter_endpoint" | quote }};
     Realm = {{ tuple "spgwc" "realm" . | include "omec-control-plane.diameter_endpoint" | quote }};