airship
/
promenade
Code Issues Proposed changes

Merge "[fix] etcd backup support for multiple releases"

This commit is contained in:
Zuul 2019-03-12 21:49:11 +00:00 committed by Gerrit Code Review
parent 4b17ac2dab 8f43897fe2
commit 46617160a5
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
charts/etcd/templates/cron-job-etcd-backup.yaml
View File

@ -21,7 +21,7 @@ limitations under the License.
apiVersion: rbac.authorization.k8s.io/v1beta1 apiVersion: rbac.authorization.k8s.io/v1beta1
kind: Role kind: Role
metadata: metadata:
name: {{ $serviceAccountName }} name: {{ .Values.service.name }}-{{ $serviceAccountName }}
rules: rules:
- apiGroups: - apiGroups:
- "" - ""
@ -36,26 +36,26 @@ kind: ServiceAccount
metadata: metadata:
labels: labels:
component: etcd-backup component: etcd-backup
name: {{ $serviceAccountName }} name: {{ .Values.service.name }}-{{ $serviceAccountName }}
namespace: {{ $envAll.Release.Namespace }} namespace: {{ $envAll.Release.Namespace }}
--- ---
apiVersion: rbac.authorization.k8s.io/v1beta1 apiVersion: rbac.authorization.k8s.io/v1beta1
kind: RoleBinding kind: RoleBinding
metadata: metadata:
name: {{ $serviceAccountName }} name: {{ .Values.service.name }}-{{ $serviceAccountName }}
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
kind: Role kind: Role
name: {{ $serviceAccountName }} name: {{ .Values.service.name }}-{{ $serviceAccountName }}
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: {{ $serviceAccountName }} name: {{ .Values.service.name }}-{{ $serviceAccountName }}
namespace: {{ $envAll.Release.Namespace }} namespace: {{ $envAll.Release.Namespace }}
--- ---
apiVersion: batch/v1beta1 apiVersion: batch/v1beta1
kind: CronJob kind: CronJob
metadata: metadata:
name: etcd-backup name: {{ .Values.service.name }}-etcd-backup
spec: spec:
schedule: {{ .Values.jobs.etcd_backup.cron | quote }} schedule: {{ .Values.jobs.etcd_backup.cron | quote }}
successfulJobsHistoryLimit: {{ .Values.jobs.etcd_backup.history.success }} successfulJobsHistoryLimit: {{ .Values.jobs.etcd_backup.history.success }}
@ -68,7 +68,7 @@ spec:
spec: spec:
template: template:
spec: spec:
serviceAccountName: {{ $serviceAccountName }} serviceAccountName: {{ .Values.service.name }}-{{ $serviceAccountName }}
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:
{{ .Values.labels.anchor.node_selector_key }}: {{ .Values.labels.anchor.node_selector_value }} {{ .Values.labels.anchor.node_selector_key }}: {{ .Values.labels.anchor.node_selector_value }}