summaryrefslogtreecommitdiffstats
path: root/kubernetes/log/templates/logstash-deployment.yaml
diff options
context:
space:
mode:
authorBorislavG <Borislav.Glozman@amdocs.com>2018-02-27 15:04:26 +0000
committerAlexis de Talhouƫt <alexis.de_talhouet@bell.ca>2018-03-01 18:10:31 +0000
commit8bfc6cf8c3d338c84c48201f7a4f274958e721a9 (patch)
tree2e0e1a969afc6ae38f0a2f62cc1a36e184cb48e1 /kubernetes/log/templates/logstash-deployment.yaml
parentf0a34e22011b4323bbd6a51ad313d6e547808101 (diff)
Run all components in one namespace
Change-Id: I5fcd4d577c1fda4de27842807c7cf7a5d372756e Issue-ID: OOM-722 Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>
Diffstat (limited to 'kubernetes/log/templates/logstash-deployment.yaml')
-rw-r--r--kubernetes/log/templates/logstash-deployment.yaml18
1 files changed, 9 insertions, 9 deletions
diff --git a/kubernetes/log/templates/logstash-deployment.yaml b/kubernetes/log/templates/logstash-deployment.yaml
index f99657a039..743108124c 100644
--- a/kubernetes/log/templates/logstash-deployment.yaml
+++ b/kubernetes/log/templates/logstash-deployment.yaml
@@ -4,8 +4,8 @@ kind: Deployment
metadata:
labels:
app: logstash
- name: logstash
- namespace: {{ .Values.nsPrefix }}-log
+ name: log-logstash
+ namespace: {{ .Values.nsPrefix }}
spec:
selector:
matchLabels:
@@ -14,7 +14,7 @@ spec:
metadata:
labels:
app: logstash
- name: logstash
+ name: log-logstash
spec:
initContainers:
- command:
@@ -52,13 +52,13 @@ spec:
volumes:
- name: logstash-conf
configMap:
- name: logstash-configmap
+ name: log-logstash-configmap
items:
- key: logstash.yml
path: logstash.yml
- name: logstash-pipeline
configMap:
- name: logstash-configmap
+ name: log-logstash-configmap
items:
- key: onap-pipeline.conf
path: onap-pipeline.conf
@@ -67,9 +67,9 @@ spec:
apiVersion: v1
kind: ConfigMap
metadata:
- name: logstash-configmap
- namespace: {{ .Values.nsPrefix }}-log
+ name: log-logstash-configmap
+ namespace: {{ .Values.nsPrefix }}
data:
-{{ (.Files.Glob "resources/logstash/conf/logstash.yml").AsConfig | indent 2 }}
-{{ (.Files.Glob "resources/logstash/pipeline/onap-pipeline.conf").AsConfig | indent 2 }}
+{{ tpl (.Files.Glob "resources/logstash/conf/logstash.yml").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/logstash/pipeline/onap-pipeline.conf").AsConfig . | indent 2 }}
#{{ end }}