AETHER-1260 Better support of helm-kustomize for omec-control-plane chart

Change-Id: I24c22cbacca60e3b6c5c3bca7ec76c9c987c2b56
diff --git a/omec/omec-control-plane/templates/configmap-spgwc.yaml b/omec/omec-control-plane/templates/configmap-spgwc.yaml
index ab73c62..645bfff 100644
--- a/omec/omec-control-plane/templates/configmap-spgwc.yaml
+++ b/omec/omec-control-plane/templates/configmap-spgwc.yaml
@@ -5,6 +5,7 @@
 */}}
 
 {{- if .Values.config.spgwc.deploy }}
+{{- if not .Values.config.useExistingConfigMap }}
 {{- $cpJson := index .Values.config.spgwc.jsonCfgFiles "cp.json" }}
 {{- $global := index $cpJson "global" }}
 {{- $configJson := index .Values.config.spgwc.jsonCfgFiles "config.json" }}
@@ -89,7 +90,7 @@
     #Port = 3868;
     #SecPort = 3869;
 
-    ConnectPeer = {{ index $configJsonGx "host" | quote }} { No_TLS; port = 3868; };
+    ConnectPeer = {{ tuple "pcrf" "identity" . | include "omec-control-plane.diameter_endpoint" | quote }} { No_TLS; port = 3868; };
 
     LoadExtension = "/usr/local/lib/freeDiameter/dict_3gpp2_avps.fdx";
     LoadExtension = "/usr/local/lib/freeDiameter/dict_draftload_avps.fdx";
@@ -134,6 +135,7 @@
   {{ $key }}: |-
 {{ toPrettyJson $value | indent 4 }}
 {{- end }}
+{{- end }}
 ---
 apiVersion: v1
 kind: ConfigMap