openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Fluentd: Change elasticsearch endpoint port and creds reference"

Browse Source
This commit is contained in:
Zuul 2018-03-14 02:02:33 +00:00 committed by Gerrit Code Review
commit ac6b9b4037
4 changed files with 13 additions and 8 deletions

2
fluent-logging/templates/deployment-fluentd.yaml

@ -120,7 +120,7 @@ spec:
- name: ELASTICSEARCH_HOST
value: {{ tuple "elasticsearch" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" | quote }}
- name: ELASTICSEARCH_PORT
value: {{ tuple "elasticsearch" "internal" "client" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}
value: {{ tuple "elasticsearch" "internal" "http" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}
- name: ELASTICSEARCH_USERNAME
valueFrom:
secretKeyRef:

13
fluent-logging/templates/job-elasticsearch-template.yaml

@ -16,6 +16,7 @@ limitations under the License.
{{- if .Values.manifests.job_elasticsearch_template }}
{{- $envAll := . }}
{{- $esUserSecret := .Values.secrets.elasticsearch.user }}
{{- $dependencies := .Values.dependencies.static.elasticsearch_template }}
{{- $mounts_elasticsearch_template := .Values.pod.mounts.elasticsearch_template.elasticsearch_template }}
{{- $mounts_elasticsearch_template_init := .Values.pod.mounts.elasticsearch_template.init_container }}
@ -44,11 +45,17 @@ spec:
- name: ELASTICSEARCH_HOST
value: {{ tuple "elasticsearch" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" | quote }}
- name: ELASTICSEARCH_PORT
value: {{ tuple "elasticsearch" "internal" "client" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}
value: {{ tuple "elasticsearch" "internal" "http" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}
- name: ELASTICSEARCH_USERNAME
value: {{ .Values.endpoints.elasticsearch.auth.admin.username }}
valueFrom:
secretKeyRef:
name: {{ $esUserSecret }}
key: ELASTICSEARCH_USERNAME
- name: ELASTICSEARCH_PASSWORD
value: {{ .Values.endpoints.elasticsearch.auth.admin.password }}
valueFrom:
secretKeyRef:
name: {{ $esUserSecret }}
key: ELASTICSEARCH_PASSWORD
command:
- /tmp/create_template.sh
volumeMounts:

2
fluent-logging/templates/pod-helm-tests.yaml

@ -43,7 +43,7 @@ spec:
name: {{ $esUserSecret }}
key: ELASTICSEARCH_PASSWORD
- name: ELASTICSEARCH_ENDPOINT
value: {{ tuple "elasticsearch" "internal" "client" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }}
value: {{ tuple "elasticsearch" "internal" "http" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }}
volumeMounts:
- name: fluent-logging-bin
mountPath: /tmp/helm-tests.sh

4
fluent-logging/values.yaml

@ -232,10 +232,8 @@ endpoints:
scheme:
default: http
port:
client:
http:
default: 80
discovery:
default: 9300
kafka:
namespace: null
name: kafka