openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Fluent-logging: Update tests and template job"

Browse Source
This commit is contained in:
Zuul 2018-07-24 17:02:35 +00:00 committed by Gerrit Code Review
commit 3281d81dac
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fluent-logging/templates/bin/_helm-tests.sh.tpl
View File

@ -46,6 +46,7 @@ function check_kubernetes_tag () {
fi fi
} }
{{ if and (.Values.manifests.job_elasticsearch_template) (not (empty .Values.conf.templates)) }}
# Tests whether fluent-logging has successfully generated the elasticsearch index mapping # Tests whether fluent-logging has successfully generated the elasticsearch index mapping
# templates defined by values.yaml # templates defined by values.yaml
function check_templates () { function check_templates () {
@ -61,9 +62,12 @@ function check_templates () {
fi fi
{{ end }} {{ end }}
} }
{{ end }}
# Sleep for at least the buffer flush time to allow for indices to be populated # Sleep for at least the buffer flush time to allow for indices to be populated
sleep 30 sleep 30
{{ if and (.Values.manifests.job_elasticsearch_template) (not (empty .Values.conf.templates)) }}
check_templates check_templates
{{ end }}
check_logstash_index check_logstash_index
check_kubernetes_tag check_kubernetes_tag

2
fluent-logging/templates/job-elasticsearch-template.yaml
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/}} */}}
{{- if .Values.manifests.job_elasticsearch_template }} {{- if and (.Values.manifests.job_elasticsearch_template) (not (empty .Values.conf.templates)) }}
{{- $envAll := . }} {{- $envAll := . }}
{{- $esUserSecret := .Values.secrets.elasticsearch.user }} {{- $esUserSecret := .Values.secrets.elasticsearch.user }}
{{- $mounts_elasticsearch_template := .Values.pod.mounts.elasticsearch_template.elasticsearch_template }} {{- $mounts_elasticsearch_template := .Values.pod.mounts.elasticsearch_template.elasticsearch_template }}