Run all components in one namespace

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

diff --git a/kubernetes/log/templates/all-services.yaml b/kubernetes/log/templates/all-services.yaml
index 5f9412e..a40a4da 100644 (file)
--- a/kubernetes/log/templates/all-services.yaml
+++ b/kubernetes/log/templates/all-services.yaml
@@ -1,10 +1,11 @@
+#{{ if not .Values.disableLogElasticsearch }}
 apiVersion: v1
 kind: Service
 metadata:
   labels:
     app: elasticsearch
   name: elasticsearch
-  namespace: {{ .Values.nsPrefix }}-log
+  namespace: {{ .Values.nsPrefix }}
 spec:
   ports:
   - name: http
@@ -17,9 +18,41 @@ spec:
 ---
 apiVersion: v1
 kind: Service
+metadata:
+  name: elasticsearchtcp
+  namespace: {{ .Values.nsPrefix }}
+  labels:
+    app: elasticsearch
+spec:
+  ports:
+  - name: tcp
+    port: 9300
+    targetPort: 9300
+  selector:
+    app: elasticsearch
+#{{ end }}
+#{{ if not .Values.disableLogLogstash }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: logstashinternal
+  namespace: {{ .Values.nsPrefix }}
+  labels:
+    app: logstash
+spec:
+  ports:
+  - name: http
+    port: 9600
+    targetPort: 9600
+  selector:
+    app: logstash
+---
+apiVersion: v1
+kind: Service
 metadata:
   name: logstash
-  namespace: {{ .Values.nsPrefix }}-log
+  namespace: {{ .Values.nsPrefix }}
   labels:
     app: logstash
 spec:
@@ -29,6 +62,8 @@ spec:
     targetPort: 5044
   selector:
     app: logstash
+#{{ end }}
+#{{ if not .Values.disableLogKibana }}
 ---
 apiVersion: v1
 kind: Service
@@ -36,7 +71,7 @@ metadata:
   labels:
     app: kibana
   name: kibana
-  namespace: {{ .Values.nsPrefix }}-log
+  namespace: {{ .Values.nsPrefix }}
 spec:
   ports:
   - name: tcp-ks
@@ -46,4 +81,4 @@ spec:
   selector:
     app: kibana
   type: NodePort
-
+#{{ end }}