Run all components in one namespace

[oom.git] / kubernetes / vfc / templates / all-services.yaml

diff --git a/kubernetes/vfc/templates/all-services.yaml b/kubernetes/vfc/templates/all-services.yaml
index ff9eea4..36a8d99 100755 (executable)
--- a/kubernetes/vfc/templates/all-services.yaml
+++ b/kubernetes/vfc/templates/all-services.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app: vfc-nslcm
   name: vfc-nslcm
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -34,7 +34,7 @@ metadata:
   labels:
     app: vfc-resmgr
   name: vfc-resmgr
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -63,7 +63,7 @@ metadata:
   labels:
     app: vfc-gvnfmdriver
   name: vfc-gvnfmdriver
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -92,7 +92,7 @@ metadata:
   labels:
     app: vfc-ztevnfmdriver
   name: vfc-ztevnfmdriver
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -121,7 +121,7 @@ metadata:
   labels:
     app: vfc-nokiavnfmdriver
   name: vfc-nokiavnfmdriver
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -150,7 +150,7 @@ metadata:
   labels:
     app: vfc-hwvnfmdriver
   name: vfc-hwvnfmdriver
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -179,7 +179,7 @@ metadata:
   labels:
     app: vfc-ztesdncdriver
   name: vfc-ztesdncdriver
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -208,7 +208,7 @@ metadata:
   labels:
     app: vfc-jujudriver
   name: vfc-jujudriver
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -237,7 +237,7 @@ metadata:
   labels:
     app: vfc-vnflcm
   name: vfc-vnflcm
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -266,7 +266,7 @@ metadata:
   labels:
     app: vfc-vnfres
   name: vfc-vnfres
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -295,7 +295,7 @@ metadata:
   labels:
     app: vfc-vnfmgr
   name: vfc-vnfmgr
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -324,7 +324,7 @@ metadata:
   labels:
     app: vfc-emsdriver
   name: vfc-emsdriver
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -353,7 +353,7 @@ metadata:
   labels:
     app: vfc-workflow
   name: vfc-workflow
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -382,7 +382,7 @@ metadata:
   labels:
     app: vfc-workflowengineactiviti
   name: vfc-workflowengineactiviti
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -411,7 +411,7 @@ metadata:
   labels:
     app: vfc-catalog
   name: vfc-catalog
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {