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 cd3c9c9..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: '[
       {
@@ -84,33 +84,62 @@ spec:
     app: vfc-gvnfmdriver
   type: NodePort
 #{{ end }}
-#{{ if not .Values.disableVfcVfcZtevmanagerdriver }}
+#{{ if not .Values.disableVfcVfcztevnfmdriver }}
 ---
 apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app: vfc-ztevmanagerdriver
-  name: vfc-ztevmanagerdriver
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+    app: vfc-ztevnfmdriver
+  name: vfc-ztevnfmdriver
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
-          "serviceName": "ztevmanagerdriver",
+          "serviceName": "ztevnfmdriver",
           "version": "v1",
-          "url": "/api/ztevmanagerdriver/v1",
+          "url": "/api/ztevnfmdriver/v1",
           "protocol": "REST",
-          "port": "{{.Values.ztevmanagerdriver.port}}",
+          "port": "{{.Values.ztevnfmdriver.port}}",
           "visualRange":"1"
       }
       ]'
 spec:
   ports:
-  - name: vfc-ztevmanagerdriver
-    port: {{.Values.ztevmanagerdriver.port}}
-    nodePort: {{.Values.ztevmanagerdriver.nodePort}}
+  - name: vfc-ztevnfmdriver
+    port: {{.Values.ztevnfmdriver.port}}
+    nodePort: {{.Values.ztevnfmdriver.nodePort}}
   selector:
-    app: vfc-ztevmanagerdriver
+    app: vfc-ztevnfmdriver
+  type: NodePort
+#{{ end }}
+#{{ if not .Values.disableVfcVfcNokiavnfmdriver }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: vfc-nokiavnfmdriver
+  name: vfc-nokiavnfmdriver
+  namespace: "{{ .Values.nsPrefix }}"
+  annotations:
+    msb.onap.org/service-info: '[
+      {
+          "serviceName": "nokiavnfmdriver",
+          "version": "v1",
+          "url": "/api/nokiavnfmdriver/v1",
+          "protocol": "REST",
+          "port": "{{.Values.nokiavnfmdriver.port}}",
+          "visualRange":"1"
+      }
+      ]'
+spec:
+  ports:
+  - name: vfc-nokiavnfmdriver
+    port: {{.Values.nokiavnfmdriver.port}}
+    nodePort: {{.Values.nokiavnfmdriver.nodePort}}
+  selector:
+    app: vfc-nokiavnfmdriver
   type: NodePort
 #{{ end }}
 #{{ if not .Values.disableVfcVfcHwvnfmdriver }}
@@ -121,7 +150,7 @@ metadata:
   labels:
     app: vfc-hwvnfmdriver
   name: vfc-hwvnfmdriver
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -135,7 +164,7 @@ metadata:
       ]'
 spec:
   ports:
-  - name: vfc-ztevmanagerdriver
+  - name: vfc-hwvnfmdriver
     port: {{.Values.hwvnfmdriver.port}}
     nodePort: {{.Values.hwvnfmdriver.nodePort}}
   selector:
@@ -150,7 +179,7 @@ metadata:
   labels:
     app: vfc-ztesdncdriver
   name: vfc-ztesdncdriver
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -179,7 +208,7 @@ metadata:
   labels:
     app: vfc-jujudriver
   name: vfc-jujudriver
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -208,7 +237,7 @@ metadata:
   labels:
     app: vfc-vnflcm
   name: vfc-vnflcm
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -237,7 +266,7 @@ metadata:
   labels:
     app: vfc-vnfres
   name: vfc-vnfres
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -266,7 +295,7 @@ metadata:
   labels:
     app: vfc-vnfmgr
   name: vfc-vnfmgr
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -295,7 +324,7 @@ metadata:
   labels:
     app: vfc-emsdriver
   name: vfc-emsdriver
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -324,7 +353,7 @@ metadata:
   labels:
     app: vfc-workflow
   name: vfc-workflow
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -345,6 +374,35 @@ spec:
     app: vfc-workflow
   type: NodePort
 #{{ end }}
+#{{ if not .Values.disableVfcVfcWorkflowEngineActiviti }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: vfc-workflowengineactiviti
+  name: vfc-workflowengineactiviti
+  namespace: "{{ .Values.nsPrefix }}"
+  annotations:
+    msb.onap.org/service-info: '[
+      {
+          "serviceName": "workflow",
+          "version": "v1",
+          "url": "/activiti-rest",
+          "protocol": "REST",
+          "port": "{{.Values.workflowengineactiviti.port}}",
+          "visualRange":"1"
+      }
+      ]'
+spec:
+  ports:
+  - name: vfc-workflow
+    port: {{.Values.workflowengineactiviti.port}}
+    nodePort: {{.Values.workflowengineactiviti.nodePort}}
+  selector:
+    app: vfc-workflow
+  type: NodePort
+#{{ end }}
 #{{ if not .Values.disableVfcVfcCatalog }}
 ---
 apiVersion: v1
@@ -353,7 +411,7 @@ metadata:
   labels:
     app: vfc-catalog
   name: vfc-catalog
-  namespace: "{{ .Values.nsPrefix }}-vfc"
+  namespace: "{{ .Values.nsPrefix }}"
   annotations:
     msb.onap.org/service-info: '[
       {