5a4d56d068
Curator is unable to use environment variables for configuration
values if the configured option contains more than the env
variable. In the case of the http_auth value (which expects
user:password), using ${USER}:${PASS} prevents curator from
successfully authenticating to elasticsearch. This moves to
dynamically define these values in the configmap if the value is
empty
This also updates values for curators actions to target logstash-
indices for its actions
Change-Id: Id5b49171e00847432e4ab0cf4be60005b70c21e3
43 lines
1.6 KiB
YAML
43 lines
1.6 KiB
YAML
{{/*
|
|
Copyright 2017 The Openstack-Helm Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/}}
|
|
|
|
{{- if .Values.manifests.configmap_etc }}
|
|
{{- $envAll := . }}
|
|
|
|
{{- if and (.Values.conf.elasticsearch.repository.enabled) (empty .Values.conf.elasticsearch.config.path.repo) -}}
|
|
{{- set .Values.conf.elasticsearch.config.path "repo" .Values.conf.elasticsearch.repository.location -}}
|
|
{{- end -}}
|
|
|
|
---
|
|
apiVersion: v1
|
|
kind: ConfigMap
|
|
metadata:
|
|
name: elasticsearch-etc
|
|
data:
|
|
httpd.conf: |
|
|
{{- tuple .Values.conf.apache.httpd "etc/_httpd.conf.tpl" . | include "helm-toolkit.utils.configmap_templater" }}
|
|
elasticsearch-host.conf: |
|
|
{{- tuple .Values.conf.apache.host "etc/_elasticsearch-host.conf.tpl" . | include "helm-toolkit.utils.configmap_templater" }}
|
|
elasticsearch.yml: |
|
|
{{ toYaml .Values.conf.elasticsearch.config | indent 4 }}
|
|
log4j2.properties: |
|
|
{{- tuple .Values.conf.elasticsearch "etc/_log4j2.properties.tpl" . | include "helm-toolkit.utils.configmap_templater" }}
|
|
action_file.yml: |
|
|
{{ toYaml .Values.conf.curator.action_file | indent 4 }}
|
|
config.yml: |
|
|
{{ toYaml .Values.conf.curator.config | indent 4 }}
|
|
{{- end }}
|