openstack
/
openstack-helm
Code Issues Proposed changes

Merge "[cinder,glance] don't randomize job names"

This commit is contained in:
Zuul 2018-12-28 04:52:51 +00:00 committed by Gerrit Code Review
parent 42d6c251cc 938d0a1390
commit c5b21ee177
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,9 +18,7 @@ limitations under the License.
{{- $envAll := . }}
{{ if or (eq .Values.conf.cinder.DEFAULT.backup_driver "cinder.backup.drivers.ceph") (include "cinder.utils.is_ceph_volume_configured" $envAll) }}
{{- $randStringSuffix := randAlphaNum 5 | lower }}
{{- $serviceAccountName := print "cinder-clean-" $randStringSuffix }}
{{- $serviceAccountName := print "cinder-clean" }}
{{ tuple $envAll "clean" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
---
apiVersion: rbac.authorization.k8s.io/v1beta1
@ -52,7 +50,7 @@ subjects:
apiVersion: batch/v1
kind: Job
metadata:
name: {{ print "cinder-clean-" $randStringSuffix }}
name: {{ print "cinder-clean" }}
annotations:
"helm.sh/hook": pre-delete
"helm.sh/hook-delete-policy": hook-succeeded

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

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