commit 8bfc6cf8c3d338c84c48201f7a4f274958e721a9
author BorislavG <Borislav.Glozman@amdocs.com> Tue Feb 27 15:04:26 2018 +0000
committer Alexis de Talhouët <alexis.de_talhouet@bell.ca> Thu Mar 01 18:10:31 2018 +0000
tree 2e0e1a969afc6ae38f0a2f62cc1a36e184cb48e1
parent f0a34e22011b4323bbd6a51ad313d6e547808101

Run all components in one namespace

Change-Id: I5fcd4d577c1fda4de27842807c7cf7a5d372756e
Issue-ID: OOM-722
Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>

kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml

diff --git a/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml b/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml
index 9999b55..a8bc983 100644
--- a/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml
+++ b/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml
@@ -3,7 +3,7 @@
 kind: Deployment
 metadata:
   name: multicloud-ocata
-  namespace: "{{ .Values.nsPrefix }}-multicloud"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   selector:
     matchLabels:
@@ -18,11 +18,11 @@
      containers:
      - env:
        - name: MSB_ADDR
-         value: "{{ .Values.msbgateway }}"
+         value: "{{ tpl .Values.msbgateway . }}"
        - name: MSB_PORT
          value: "{{ .Values.msbPort }}"
        - name: AAI_ADDR
-         value: aai-service.{{ .Values.nsPrefix }}-aai
+         value: aai-service.{{ .Values.nsPrefix }}
        - name: AAI_PORT
          value: "8443"
        - name: AAI_SCHEMA_VERSION