Run all components in one namespace

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

diff --git a/kubernetes/aai/templates/all-services.yaml b/kubernetes/aai/templates/all-services.yaml
index 5d1c09e..01f24a7 100644 (file)
--- a/kubernetes/aai/templates/all-services.yaml
+++ b/kubernetes/aai/templates/all-services.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: hbase
-  namespace: "{{ .Values.nsPrefix }}-aai"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: hbase
 spec:
@@ -32,7 +32,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: aai-service
-  namespace: "{{ .Values.nsPrefix }}-aai"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: aai-service
   annotations:
@@ -150,6 +150,25 @@ metadata:
           "enable_ssl": true,
           "visualRange": "1",
           "path": "/aai/v11/network"
+      },
+      {
+          "serviceName": "aai-externalSystem",
+          "version": "v11",
+          "url": "/aai/v11/external-system",
+          "protocol": "REST",
+          "port": "8443",
+          "enable_ssl": true,
+          "visualRange": "1"
+      },
+      {
+          "serviceName": "aai-externalSystem-deprecated",
+          "version": "v11",
+          "url": "/aai/v11/external-system",
+          "protocol": "REST",
+          "port": "8443",
+          "enable_ssl": true,
+          "visualRange": "1",
+          "path": "/aai/v11/external-system"
       }
       ]'
 spec:
@@ -165,6 +184,7 @@ spec:
   type: NodePort
   selector:
     app: aai-service
+  clusterIP: {{ .Values.aaiServiceClusterIp }}
 #{{ end }}
 #{{ if not .Values.disableAaiModelLoaderService }}
 ---
@@ -172,7 +192,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: model-loader-service
-  namespace: "{{ .Values.nsPrefix }}-aai"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: model-loader-service
 spec:
@@ -192,7 +212,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: gremlin
-  namespace: "{{ .Values.nsPrefix }}-aai"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: gremlin
 spec:
@@ -207,16 +227,16 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: elasticsearch
-  namespace: "{{ .Values.nsPrefix }}-aai"
+  name: aai-elasticsearch
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
-    app: elasticsearch
+    app: aai-elasticsearch
 spec:
   ports:
-  - name: "elasticsearch-port"
+  - name: "aai-elasticsearch-port"
     port: 9200
   selector:
-    app: elasticsearch
+    app: aai-elasticsearch
   clusterIP: None
 #{{ end }}
 #{{ if not .Values.disableAaiSearchDataService }}
@@ -225,7 +245,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: search-data-service
-  namespace: "{{ .Values.nsPrefix }}-aai"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: search-data-service
 spec:
@@ -242,7 +262,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: aai-traversal
-  namespace: "{{ .Values.nsPrefix }}-aai"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: aai-traversal
 spec:
@@ -261,7 +281,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: aai-resources
-  namespace: "{{ .Values.nsPrefix }}-aai"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: aai-resources
 spec:
@@ -280,7 +300,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: sparky-be
-  namespace: "{{ .Values.nsPrefix }}-aai"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: sparky-be
 spec:
@@ -290,4 +310,4 @@ spec:
   selector:
     app: sparky-be
   clusterIP: None
-#{{ end }}
\ No newline at end of file
+#{{ end }}