Run all components in one namespace

Change-Id: I5fcd4d577c1fda4de27842807c7cf7a5d372756e
Issue-ID: OOM-722
Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>
diff --git a/kubernetes/vfc/templates/vfc-vnflcm-deployment.yaml b/kubernetes/vfc/templates/vfc-vnflcm-deployment.yaml
index 0d89229..ef4793d 100755
--- a/kubernetes/vfc/templates/vfc-vnflcm-deployment.yaml
+++ b/kubernetes/vfc/templates/vfc-vnflcm-deployment.yaml
@@ -3,7 +3,7 @@
 kind: Deployment
 metadata:
   name: vfc-vnflcm
-  namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.vnflcm.replicas }}
   selector:
@@ -22,7 +22,7 @@
         name: "vfc-vnflcm"
         env:
         - name: MSB_ADDR
-          value: {{ .Values.msbaddr }}
+          value: {{ tpl .Values.msbaddr . }}
         ports:
         - containerPort: {{ .Values.vnflcm.port }}
         readinessProbe:
@@ -33,4 +33,4 @@
         imagePullPolicy: "{{ .Values.pullPolicy }}"
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
\ No newline at end of file
+#{{ end }}