openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "[gnocchi] don't randomize job names"

Browse Source
This commit is contained in:
Zuul 2018-12-21 04:34:38 +00:00 committed by Gerrit Code Review
commit 5ea831964e
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnocchi/templates/job-clean.yaml
View File

@ -17,9 +17,7 @@ limitations under the License.
{{- if .Values.manifests.job_clean }}
{{- $envAll := . }}
{{- $randStringSuffix := randAlphaNum 5 | lower }}
{{- $serviceAccountName := print "gnocchi-clean-" $randStringSuffix }}
{{- $serviceAccountName := print "gnocchi-clean" }}
{{ tuple $envAll "clean" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
---
apiVersion: rbac.authorization.k8s.io/v1beta1
@ -51,7 +49,7 @@ subjects:
apiVersion: batch/v1
kind: Job
metadata:
name: {{ print "gnocchi-clean-" $randStringSuffix }}
name: {{ print "gnocchi-clean" }}
annotations:
"helm.sh/hook": pre-delete
"helm.sh/hook-delete-policy": hook-succeeded