openstack/openstack-helm
Code Issues Proposed changes

Merge "CronJobs: Allow cronjob history to be controlled"

Browse Source
This commit is contained in:
Zuul 2018-02-09 01:49:57 +00:00 committed by Gerrit Code Review
commit cb41a8f1db
5 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cinder/templates/cron-job-cinder-volume-usage-audit.yaml
View File

@ -25,12 +25,14 @@ limitations under the License.
{{- $serviceAccountName := "cinder-volume-usage-audit" }} {{- $serviceAccountName := "cinder-volume-usage-audit" }}
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---
apiVersion: batch/v2alpha1 apiVersion: batch/v1beta1
kind: CronJob kind: CronJob
metadata: metadata:
name: cinder-volume-usage-audit name: cinder-volume-usage-audit
spec: spec:
schedule: {{ .Values.jobs.volume_usage_audit.cron | quote }} schedule: {{ .Values.jobs.volume_usage_audit.cron | quote }}
successfulJobsHistoryLimit: {{ .Values.jobs.volume_usage_audit.history.success }}
failedJobsHistoryLimit: {{ .Values.jobs.volume_usage_audit.history.failed }}
concurrencyPolicy: Forbid concurrencyPolicy: Forbid
jobTemplate: jobTemplate:
metadata: metadata:

3
cinder/values.yaml
View File

@ -51,6 +51,9 @@ images:
jobs: jobs:
volume_usage_audit: volume_usage_audit:
cron: "*/5 * * * *" cron: "*/5 * * * *"
history:
success: 3
failed: 1
pod: pod:
user: user:

4
keystone/templates/cron-job-credential-rotate.yaml
View File

@ -53,12 +53,14 @@ subjects:
name: {{ $serviceAccountName }} name: {{ $serviceAccountName }}
namespace: {{ $envAll.Release.Namespace }} namespace: {{ $envAll.Release.Namespace }}
--- ---
apiVersion: batch/v2alpha1 apiVersion: batch/v1beta1
kind: CronJob kind: CronJob
metadata: metadata:
name: keystone-credential-rotate name: keystone-credential-rotate
spec: spec:
schedule: {{ .Values.jobs.credential_rotate.cron | quote }} schedule: {{ .Values.jobs.credential_rotate.cron | quote }}
successfulJobsHistoryLimit: {{ .Values.jobs.credential_rotate.history.success }}
failedJobsHistoryLimit: {{ .Values.jobs.credential_rotate.history.failed }}
concurrencyPolicy: Forbid concurrencyPolicy: Forbid
jobTemplate: jobTemplate:
metadata: metadata:

4
keystone/templates/cron-job-fernet-rotate.yaml
View File

@ -53,12 +53,14 @@ subjects:
name: {{ $serviceAccountName }} name: {{ $serviceAccountName }}
namespace: {{ $envAll.Release.Namespace }} namespace: {{ $envAll.Release.Namespace }}
--- ---
apiVersion: batch/v2alpha1 apiVersion: batch/v1beta1
kind: CronJob kind: CronJob
metadata: metadata:
name: keystone-fernet-rotate name: keystone-fernet-rotate
spec: spec:
schedule: {{ .Values.jobs.fernet_rotate.cron | quote }} schedule: {{ .Values.jobs.fernet_rotate.cron | quote }}
successfulJobsHistoryLimit: {{ .Values.jobs.fernet_rotate.history.success }}
failedJobsHistoryLimit: {{ .Values.jobs.fernet_rotate.history.failed }}
concurrencyPolicy: Forbid concurrencyPolicy: Forbid
jobTemplate: jobTemplate:
metadata: metadata:

6
keystone/values.yaml
View File

@ -247,6 +247,9 @@ jobs:
cron: "0 0 * * 0" cron: "0 0 * * 0"
user: keystone user: keystone
group: keystone group: keystone
history:
success: 3
failed: 1
credential_setup: credential_setup:
user: keystone user: keystone
group: keystone group: keystone
@ -256,6 +259,9 @@ jobs:
migrate_wait: 120 migrate_wait: 120
user: keystone user: keystone
group: keystone group: keystone
history:
success: 3
failed: 1
conf: conf:
keystone: keystone: