AETHER-1361 Fix restart fails when mounted configmap with subpath modified

Also removed unnecessary environment variables for gx-app container

Change-Id: I10c87fa4e7c0795a7c2f788cce6e81f212b78a76
diff --git a/omec/omec-control-plane/templates/configmap-pcrf.yaml b/omec/omec-control-plane/templates/configmap-pcrf.yaml
index e4177a1..9400601 100644
--- a/omec/omec-control-plane/templates/configmap-pcrf.yaml
+++ b/omec/omec-control-plane/templates/configmap-pcrf.yaml
@@ -27,7 +27,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: pcrf
+  name: pcrf-configs
   labels:
 {{ tuple "pcrf" . | include "omec-control-plane.metadata_labels" | indent 4 }}
 data:
@@ -96,12 +96,20 @@
     LoadExtension = "/usr/local/lib/freeDiameter/dict_Rx.fdx";
     LoadExtension = "/usr/local/lib/freeDiameter/dict_Sd.fdx";
     LoadExtension = "/usr/local/lib/freeDiameter/dict_St.fdx";
-  pcrf-run.sh: |
-{{ tuple "bin/_pcrf-run.sh.tpl" . | include "omec-control-plane.template" | indent 4 }}
-  pcrf-bootstrap.sh: |
-{{ tuple "bin/_pcrf-bootstrap.sh.tpl" . | include "omec-control-plane.template" | indent 4 }}
 {{- range $key, $value := .Values.config.pcrf.cfgFiles }}
   {{ $key }}: |-
 {{ toPrettyJson $value | indent 4 }}
 {{- end }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: pcrf-scripts
+  labels:
+{{ tuple "pcrf" . | include "omec-control-plane.metadata_labels" | indent 4 }}
+data:
+  pcrf-run.sh: |
+{{ tuple "bin/_pcrf-run.sh.tpl" . | include "omec-control-plane.template" | indent 4 }}
+  pcrf-bootstrap.sh: |
+{{ tuple "bin/_pcrf-bootstrap.sh.tpl" . | include "omec-control-plane.template" | indent 4 }}
 {{- end }}