openstack/openstack-helm
Code Issues Proposed changes

Merge "Elasticsearch: Allow override of job back off limits and deadlines"

Browse Source
This commit is contained in:
Zuul 2019-06-18 21:18:47 +00:00 committed by Gerrit Code Review
commit 79582a1ba5
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elasticsearch/templates/job-es-cluster-wait.yaml
View File

@ -29,6 +29,7 @@ metadata:
annotations: annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
spec: spec:
backoffLimit: {{ .Values.jobs.es_cluster_wait.backoffLimit }}
template: template:
metadata: metadata:
labels: labels:
@ -36,6 +37,7 @@ spec:
spec: spec:
{{ dict "envAll" $envAll "application" "es_cluster_wait" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }} {{ dict "envAll" $envAll "application" "es_cluster_wait" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
serviceAccountName: {{ $serviceAccountName }} serviceAccountName: {{ $serviceAccountName }}
activeDeadlineSeconds: {{ .Values.jobs.es_cluster_wait.activeDeadlineSeconds }}
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:
{{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value | quote }} {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value | quote }}

2
elasticsearch/templates/job-register-snapshot-repository.yaml
View File

@ -30,6 +30,7 @@ metadata:
annotations: annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
spec: spec:
backoffLimit: {{ .Values.jobs.snapshot_repository.backoffLimit }}
template: template:
metadata: metadata:
labels: labels:
@ -37,6 +38,7 @@ spec:
spec: spec:
{{ dict "envAll" $envAll "application" "snapshot_repository" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }} {{ dict "envAll" $envAll "application" "snapshot_repository" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
serviceAccountName: {{ $serviceAccountName }} serviceAccountName: {{ $serviceAccountName }}
activeDeadlineSeconds: {{ .Values.jobs.snapshot_repository.activeDeadlineSeconds }}
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:
{{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value | quote }} {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value | quote }}

6
elasticsearch/values.yaml
View File

@ -367,6 +367,12 @@ jobs:
history: history:
success: 3 success: 3
failed: 1 failed: 1
es_cluster_wait:
backoffLimit: 6
activeDeadlineSeconds: 600
snapshot_repository:
backoffLimit: 6
activeDeadlineSeconds: 600
conf: conf:
httpd: | httpd: |