10 files changed, 21 insertions, 21 deletions
diff --git a/kubernetes/sdc/templates/all-services.yaml b/kubernetes/sdc/templates/all-services.yaml
index 4100dc24a4..247ee034a8 100644
--- a/kubernetes/sdc/templates/all-services.yaml
+++ b/kubernetes/sdc/templates/all-services.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app: sdc-es
   name: sdc-es
-  namespace: "{{ .Values.nsPrefix }}-sdc"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   ports:
   - name: sdc-es-port-9200
@@ -24,7 +24,7 @@ metadata:
   labels:
     app: sdc-cs
   name: sdc-cs
-  namespace: "{{ .Values.nsPrefix }}-sdc"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   ports:
   - name: sdc-cs-port-9042
@@ -43,7 +43,7 @@ metadata:
   labels:
     app: sdc-kb
   name: sdc-kb
-  namespace: "{{ .Values.nsPrefix }}-sdc"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   ports:
   - name: sdc-kb-port-5601
@@ -60,7 +60,7 @@ metadata:
   labels:
     app: sdc-be
   name: sdc-be
-  namespace: "{{ .Values.nsPrefix }}-sdc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -101,7 +101,7 @@ metadata:
   labels:
     app: sdc-fe
   name: sdc-fe
-  namespace: "{{ .Values.nsPrefix }}-sdc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
diff --git a/kubernetes/sdc/templates/sdc-be.yaml b/kubernetes/sdc/templates/sdc-be.yaml
index 3b72071099..d075277d91 100644
--- a/kubernetes/sdc/templates/sdc-be.yaml
+++ b/kubernetes/sdc/templates/sdc-be.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app: sdc-be
   name: sdc-be
-  namespace: "{{ .Values.nsPrefix }}-sdc"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   selector:
     matchLabels:
@@ -42,7 +42,7 @@ spec:
         - dmaap
         env:
         - name: NAMESPACE
-          value: {{ .Values.nsPrefix }}-message-router
+          value: {{ .Values.nsPrefix }}
         image: {{ .Values.image.readiness }}
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: sdc-dmaap-readiness
diff --git a/kubernetes/sdc/templates/sdc-cs.yaml b/kubernetes/sdc/templates/sdc-cs.yaml
index 32aba467b3..bf86de6fe2 100644
--- a/kubernetes/sdc/templates/sdc-cs.yaml
+++ b/kubernetes/sdc/templates/sdc-cs.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app: sdc-cs
   name: sdc-cs
-  namespace: "{{ .Values.nsPrefix }}-sdc"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   selector:
     matchLabels:
diff --git a/kubernetes/sdc/templates/sdc-environments-configmap.yaml b/kubernetes/sdc/templates/sdc-environments-configmap.yaml
index f8456b0efe..e1ff5581fd 100644
--- a/kubernetes/sdc/templates/sdc-environments-configmap.yaml
+++ b/kubernetes/sdc/templates/sdc-environments-configmap.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: sdc-environments-configmap
-  namespace: {{ .Values.nsPrefix }}-sdc
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/environments/*").AsConfig . | indent 2 }}
 #{{ end }}
diff --git a/kubernetes/sdc/templates/sdc-es.yaml b/kubernetes/sdc/templates/sdc-es.yaml
index 1a2f70d77e..979c70df5b 100644
--- a/kubernetes/sdc/templates/sdc-es.yaml
+++ b/kubernetes/sdc/templates/sdc-es.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app: sdc-es
   name: sdc-es
-  namespace: "{{ .Values.nsPrefix }}-sdc"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   selector:
     matchLabels:
diff --git a/kubernetes/sdc/templates/sdc-fe-configmap.yaml b/kubernetes/sdc/templates/sdc-fe-configmap.yaml
index 2f60ef88e3..05c0a1645c 100644
--- a/kubernetes/sdc/templates/sdc-fe-configmap.yaml
+++ b/kubernetes/sdc/templates/sdc-fe-configmap.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: sdc-fe-configmap
-  namespace: {{ .Values.nsPrefix }}-sdc
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/sdc-fe/*").AsConfig . | indent 2 }}
 #{{ end }}
diff --git a/kubernetes/sdc/templates/sdc-fe.yaml b/kubernetes/sdc/templates/sdc-fe.yaml
index d1144d999e..adcec19ffe 100644
--- a/kubernetes/sdc/templates/sdc-fe.yaml
+++ b/kubernetes/sdc/templates/sdc-fe.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app: sdc-fe
   name: sdc-fe
-  namespace: "{{ .Values.nsPrefix }}-sdc"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   selector:
     matchLabels:
diff --git a/kubernetes/sdc/templates/sdc-kb.yaml b/kubernetes/sdc/templates/sdc-kb.yaml
index a0a00a0d39..90fc6f2a21 100644
--- a/kubernetes/sdc/templates/sdc-kb.yaml
+++ b/kubernetes/sdc/templates/sdc-kb.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app: sdc-kb
   name: sdc-kb
-  namespace: "{{ .Values.nsPrefix }}-sdc"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   selector:
     matchLabels:
diff --git a/kubernetes/sdc/templates/sdc-log-configmap.yaml b/kubernetes/sdc/templates/sdc-log-configmap.yaml
index c79f9e064c..f2b5c09d0b 100644
--- a/kubernetes/sdc/templates/sdc-log-configmap.yaml
+++ b/kubernetes/sdc/templates/sdc-log-configmap.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: sdc-log-be-configmap
-  namespace: {{ .Values.nsPrefix }}-sdc
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/log/be/*").AsConfig . | indent 2 }}
 ---
@@ -11,7 +11,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: sdc-filebeat-configmap
-  namespace: {{ .Values.nsPrefix }}-sdc
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/log/filebeat/*").AsConfig . | indent 2 }}
 #{{ end }}
@@ -21,7 +21,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: sdc-log-fe-configmap
-  namespace: {{ .Values.nsPrefix }}-sdc
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/log/fe/*").AsConfig . | indent 2 }}
 #{{ end }}
diff --git a/kubernetes/sdc/templates/sdc-pv-pvc.yaml b/kubernetes/sdc/templates/sdc-pv-pvc.yaml
index 254e55132b..8d9becf2d5 100644
--- a/kubernetes/sdc/templates/sdc-pv-pvc.yaml
+++ b/kubernetes/sdc/templates/sdc-pv-pvc.yaml
@@ -2,10 +2,10 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: "{{ .Values.nsPrefix }}-sdc-cs-db"
-  namespace: "{{ .Values.nsPrefix }}-sdc"
+  name: "{{ .Values.nsPrefix }}-sdc"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
-    name: "{{ .Values.nsPrefix }}-sdc-cs-db"
+    name: "{{ .Values.nsPrefix }}-sdc"
 spec:
   capacity:
     storage: 2Gi
@@ -19,7 +19,7 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: sdc-cs-db
-  namespace: "{{ .Values.nsPrefix }}-sdc"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   accessModes:
     - ReadWriteMany
@@ -28,5 +28,5 @@ spec:
       storage: 2Gi
   selector:
     matchLabels:
-      name: "{{ .Values.nsPrefix }}-sdc-cs-db"
+      name: "{{ .Values.nsPrefix }}-sdc"
 #{{ end }}