Run all components in one namespace

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

diff --git a/kubernetes/policy/templates/all-services.yaml b/kubernetes/policy/templates/all-services.yaml
index 8236033..3971b29 100644 (file)
--- a/kubernetes/policy/templates/all-services.yaml
+++ b/kubernetes/policy/templates/all-services.yaml
@@ -1,8 +1,9 @@
+#{{ if not .Values.disablePolicyMariadb }}
 apiVersion: v1
 kind: Service
 metadata:
   name: mariadb
-  namespace: "{{ .Values.nsPrefix }}-policy"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: mariadb
 spec:
@@ -12,6 +13,8 @@ spec:
   selector:
     app: mariadb
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disablePolicyNexus }}
 ---
 apiVersion: v1
 kind: Service
@@ -19,7 +22,7 @@ metadata:
   labels:
     app: nexus
   name: nexus
-  namespace: "{{ .Values.nsPrefix }}-policy"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   ports:
   - name: nexus-port
@@ -27,6 +30,8 @@ spec:
   selector:
     app: nexus
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disablePolicyDrools }}
 ---
 apiVersion: v1
 kind: Service
@@ -34,79 +39,93 @@ metadata:
   labels:
     app: drools
   name: drools
-  namespace: "{{ .Values.nsPrefix }}-policy"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   ports:
   - name: "drools-port"
     port: 6969
-    nodePort: 30217
+    nodePort: {{ .Values.nodePortPrefix }}17
+  - name: "drools-port2"
+    port: 9696
+    nodePort: {{ .Values.nodePortPrefix }}21
   selector:
     app: drools
   type: NodePort
+#{{ end }}
+#{{ if not .Values.disablePolicyPap }}
 ---
 apiVersion: v1
 kind: Service
 metadata:
   name: pap
-  namespace: "{{ .Values.nsPrefix }}-policy"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: pap
 spec:
   ports:
   - name: 8443-port
     port: 8443
-    nodePort: 30219
+    nodePort: {{ .Values.nodePortPrefix }}19
   - name: 9091-port
     port: 9091
-    nodePort: 30218
+    nodePort: {{ .Values.nodePortPrefix }}18
   selector:
     app: pap
   type: NodePort
+#{{ end }}
+#{{ if not .Values.disablePolicyPdp }}
 ---
 apiVersion: v1
 kind: Service
 metadata:
   name: pdp
-  namespace: "{{ .Values.nsPrefix }}-policy"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: pdp
+  annotations:
+    msb.onap.org/service-info: '[
+      {
+          "serviceName": "policy-pdp",
+          "version": "v1",
+          "url": "/pdp",
+          "protocol": "REST",
+          "port": "8081",
+          "visualRange":"1"
+      },
+      {
+          "serviceName": "policy-pdp-deprecated",
+          "version": "v1",
+          "url": "/pdp",
+          "protocol": "REST",
+          "port": "8081",
+          "visualRange":"1",
+          "path":"/pdp"
+      }
+      ]'
 spec:
   ports:
   - name: 8081-port
     port: 8081
-    nodePort: 30220
+    nodePort: {{ .Values.nodePortPrefix }}20
   selector:
     app: pdp
   type: NodePort
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: pypdp
-  namespace: "{{ .Values.nsPrefix }}-policy"
-  labels:
-    app: pypdp
-spec:
-  ports:
-  - name: tcp-31032-8480-bm91k
-    port: 8480
-    nodePort: 30221
-  selector:
-    app: pypdp
-  type: NodePort
+#{{ end }}
+#{{ if not .Values.disablePolicyBrmsgw }}
 ---
 apiVersion: v1
 kind: Service
 metadata:
   name: brmsgw
-  namespace: "{{ .Values.nsPrefix }}-policy"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: brmsgw
 spec:
   ports:
   - name: 9989-port
     port: 9989
-    nodePort: 30216
+    nodePort: {{ .Values.nodePortPrefix }}16
   selector:
     app: brmsgw
   type: NodePort
+#{{ end }}