f28ef6ded2
Updates the fluent-logging chart to reference the elasticsearch endpoint via lookups on the `http` port to match the elasticsearch chart's handling of the client port. This also updates the helm test pod to reference the elasticsearch credentials via the secret used elsewhere in the fluent-logging chart Change-Id: I352d912db5e231e14dc58cdf897ae642f3256373
58 lines
1.7 KiB
YAML
58 lines
1.7 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.helm_tests }}
|
|
{{- $envAll := . }}
|
|
{{- $esUserSecret := .Values.secrets.elasticsearch.user }}
|
|
---
|
|
apiVersion: v1
|
|
kind: Pod
|
|
metadata:
|
|
name: "{{.Release.Name}}-test"
|
|
annotations:
|
|
"helm.sh/hook": test-success
|
|
spec:
|
|
restartPolicy: Never
|
|
containers:
|
|
- name: {{.Release.Name}}-helm-tests
|
|
{{ tuple $envAll "helm_tests" | include "helm-toolkit.snippets.image" | indent 6 }}
|
|
command:
|
|
- /tmp/helm-tests.sh
|
|
env:
|
|
- name: ELASTICSEARCH_USERNAME
|
|
valueFrom:
|
|
secretKeyRef:
|
|
name: {{ $esUserSecret }}
|
|
key: ELASTICSEARCH_USERNAME
|
|
- name: ELASTICSEARCH_PASSWORD
|
|
valueFrom:
|
|
secretKeyRef:
|
|
name: {{ $esUserSecret }}
|
|
key: ELASTICSEARCH_PASSWORD
|
|
- name: ELASTICSEARCH_ENDPOINT
|
|
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
|
|
subPath: helm-tests.sh
|
|
readOnly: true
|
|
volumes:
|
|
- name: fluent-logging-bin
|
|
configMap:
|
|
name: fluent-logging-bin
|
|
defaultMode: 0555
|
|
{{- end }}
|