Update addons charts
Updates the charts in addons with updated helm-toolkit functions Change-Id: Ib7fb9da4fea9ea53270fde7376f30d7585b7285f
This commit is contained in:
parent
8d4f14995c
commit
877ee5a961
|
@ -19,27 +19,7 @@ kind: ConfigMap
|
|||
metadata:
|
||||
name: elastic-etc
|
||||
data:
|
||||
elasticsearch.yml: |
|
||||
{{ if .Values.conf.elasticsearch.override -}}
|
||||
{{ .Values.conf.elasticsearch.override | indent 4 }}
|
||||
{{- else -}}
|
||||
{{- if .Values.conf.elasticsearch.prefix -}}
|
||||
{{ .Values.conf.elasticsearch.prefix | indent 4 }}
|
||||
{{- end }}
|
||||
{{ tuple "etc/_elasticsearch.yml.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
|
||||
{{- end }}
|
||||
{{- if .Values.conf.elasticsearch.append -}}
|
||||
{{ .Values.conf.elasticsearch.append | indent 4 }}
|
||||
{{- end }}
|
||||
logging.yml: |
|
||||
{{ if .Values.conf.logging.override -}}
|
||||
{{ .Values.conf.logging.override | indent 4 }}
|
||||
{{- else -}}
|
||||
{{- if .Values.conf.logging.prefix -}}
|
||||
{{ .Values.conf.logging.prefix | indent 4 }}
|
||||
{{- end }}
|
||||
{{ tuple "etc/_logging.yml.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
|
||||
{{- end }}
|
||||
{{- if .Values.conf.logging.append -}}
|
||||
{{ .Values.conf.logging.append | indent 4 }}
|
||||
{{- end }}
|
||||
elasticsearch.yml: |+
|
||||
{{- tuple .Values.conf.elasticsearch "etc/_elasticsearch.yml.tpl" . | include "helm-toolkit.utils.configmap_templater" }}
|
||||
logging.yml: |+
|
||||
{{- tuple .Values.conf.elasticsearch "etc/_logging.yml.tpl" . | include "helm-toolkit.utils.configmap_templater" }}
|
||||
|
|
|
@ -30,11 +30,12 @@ spec:
|
|||
- /tmp/helm-tests.sh
|
||||
env:
|
||||
- name: ELASTICSEARCH_ENDPOINT
|
||||
value: {{ tuple "logging_db" "default" "api" $envAll | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }}
|
||||
value: {{ tuple "logging_db" "internal" "client" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }}
|
||||
volumeMounts:
|
||||
- name: elastic-bin
|
||||
mountPath: /tmp/helm-tests.sh
|
||||
subPath: helm-tests.sh
|
||||
readOnly: true
|
||||
volumes:
|
||||
- name: elastic-bin
|
||||
configMap:
|
||||
|
|
|
@ -41,6 +41,7 @@ conf:
|
|||
append:
|
||||
|
||||
endpoints:
|
||||
cluster_domain_suffix: cluster.local
|
||||
logging_db:
|
||||
name: elasticsearch
|
||||
hosts:
|
||||
|
@ -48,12 +49,14 @@ endpoints:
|
|||
default: elasticsearch-logging
|
||||
discovery: elasticsearch-discovery
|
||||
public: elasticsearch
|
||||
host_fqdn_override:
|
||||
default: null
|
||||
path:
|
||||
default: null
|
||||
scheme:
|
||||
default: http
|
||||
port:
|
||||
api:
|
||||
client:
|
||||
default: 9200
|
||||
|
||||
images:
|
||||
|
|
|
@ -22,8 +22,4 @@ metadata:
|
|||
name: fluentd-etc
|
||||
data:
|
||||
td-agent.conf: |+
|
||||
{{ if .Values.conf.fluentd.override -}}
|
||||
{{ .Values.conf.fluentd.override | indent 4 }}
|
||||
{{- else -}}
|
||||
{{ tuple "etc/_td-agent.conf.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
|
||||
{{- end }}
|
||||
{{- tuple .Values.conf.td_agent "etc/_td-agent.conf.tpl" . | include "helm-toolkit.utils.configmap_templater" }}
|
||||
|
|
|
@ -30,7 +30,7 @@ spec:
|
|||
- /tmp/fluentd-test.sh
|
||||
env:
|
||||
- name: ELASTICSEARCH_ENDPOINT
|
||||
value: {{ tuple "log_database" "default" "client" $envAll | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }}
|
||||
value: {{ tuple "logging_db" "internal" "client" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }}
|
||||
volumeMounts:
|
||||
- name: fluentd-bin
|
||||
mountPath: /tmp/fluentd-test.sh
|
||||
|
|
|
@ -22,15 +22,18 @@ images:
|
|||
pull_policy: IfNotPresent
|
||||
|
||||
conf:
|
||||
fluentd:
|
||||
td_agent:
|
||||
override:
|
||||
|
||||
endpoints:
|
||||
log_database:
|
||||
cluster_domain_suffix: cluster.local
|
||||
logging_db:
|
||||
name: elasticsearch
|
||||
hosts:
|
||||
default: elasticsearch-logging
|
||||
public: elasticsearch
|
||||
host_fqdn_override:
|
||||
default: null
|
||||
path:
|
||||
default: null
|
||||
scheme:
|
||||
|
|
|
@ -60,10 +60,13 @@ conf:
|
|||
append:
|
||||
|
||||
endpoints:
|
||||
cluster_domain_suffix: cluster.local
|
||||
log_database:
|
||||
hosts:
|
||||
default: elasticsearch-logging
|
||||
public: elasticsearch
|
||||
host_fqdn_override:
|
||||
default: null
|
||||
name: elasticsearch
|
||||
path:
|
||||
default: null
|
||||
|
@ -76,6 +79,8 @@ endpoints:
|
|||
hosts:
|
||||
default: kibana-dash
|
||||
public: kibana
|
||||
host_fqdn_override:
|
||||
default: null
|
||||
name: kibana
|
||||
path:
|
||||
default: null
|
||||
|
|
Loading…
Reference in New Issue