diff options
| author |   Alexis de Talhouët <alexis.de_talhouet@bell.ca> | 2018-01-24 17:45:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-01-24 17:45:39 +0000 |
| commit | c07f97b782ab1bc887c101c02a668a05d2cb0fce (patch) | |
| tree | f22783f9eca4f5a6826ee1fefc3b8b95a4d41148 | |
| parent | 744bad32171df0e6f8fc0ef28be86c2bd99dbaf1 (diff) | |
| parent | d21b8b6ae2c3acff0f640e7b3093d977ee402964 (diff) | |
Merge "change in log config seg"
| -rw-r--r-- | kubernetes/log/templates/elasticsearch-deployment.yaml | 16 | ||||
| -rw-r--r-- | kubernetes/log/values.yaml | 3 |
2 files changed, 13 insertions, 6 deletions
diff --git a/kubernetes/log/templates/elasticsearch-deployment.yaml b/kubernetes/log/templates/elasticsearch-deployment.yaml index 74ab921834..bbf7260faa 100644 --- a/kubernetes/log/templates/elasticsearch-deployment.yaml +++ b/kubernetes/log/templates/elasticsearch-deployment.yaml @@ -18,9 +18,14 @@ spec: spec: initContainers: - command: - - sysctl - - -w - - vm.max_map_count=262144 + - /bin/sh + - -c + - | + sysctl -w vm.max_map_count=262144 + mkdir -p /logroot/elasticsearch/logs + mkdir -p /logroot/elasticsearch/data + chmod -R 777 /logroot/elasticsearch + chown -R root:root /logroot env: - name: NAMESPACE valueFrom: @@ -32,6 +37,9 @@ spec: image: {{ .Values.image.es_bb }} imagePullPolicy: {{ .Values.pullPolicy }} name: init-sysctl + volumeMounts: + - name: elasticsearch-logs + mountPath: /logroot/ containers: - name: elasticsearch image: {{ .Values.image.elasticsearch}} @@ -59,7 +67,7 @@ spec: claimName: elasticsearch-db - name: elasticsearch-logs hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/elasticsearch/logs + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/ - name: elasticsearch-conf configMap: name: elasticsearch-configmap diff --git a/kubernetes/log/values.yaml b/kubernetes/log/values.yaml index 04418302b2..3ee3529c7b 100644 --- a/kubernetes/log/values.yaml +++ b/kubernetes/log/values.yaml @@ -1,5 +1,5 @@ nsPrefix: onap -pullPolicy: Always +pullPolicy: Always nodePortPrefix: 302 image: readiness: oomk8s/readiness-check:1.0.0 @@ -7,4 +7,3 @@ image: kibana: docker.elastic.co/kibana/kibana:5.5.0 elasticsearch: docker.elastic.co/elasticsearch/elasticsearch:5.5.0 es_bb: busybox - |