From 01fe5e32178ea1540d1907a7a8badf3bf530c520 Mon Sep 17 00:00:00 2001 From: Adam Hamsik Date: Thu, 30 Jul 2020 12:00:30 +0200 Subject: [PATCH] [stable] [elasticsearch-curator] Make sure we can specify startingDeadlineSeconds for each cronjob. Add myself to chart maintainers. (#23278) Signed-off-by: Adam Hamsik Co-authored-by: Marian Soltys --- stable/elasticsearch-curator/Chart.yaml | 4 +++- stable/elasticsearch-curator/OWNERS | 2 ++ stable/elasticsearch-curator/README.md | 1 + stable/elasticsearch-curator/templates/cronjob.yaml | 3 +++ stable/elasticsearch-curator/values.yaml | 1 + 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/stable/elasticsearch-curator/Chart.yaml b/stable/elasticsearch-curator/Chart.yaml index b3b36f6140..ee63e6dc9f 100644 --- a/stable/elasticsearch-curator/Chart.yaml +++ b/stable/elasticsearch-curator/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "5.7.6" description: A Helm chart for Elasticsearch Curator name: elasticsearch-curator -version: 2.1.5 +version: 2.2.0 home: https://github.com/elastic/curator keywords: - curator @@ -16,3 +16,5 @@ maintainers: email: cedric.dsm@gmail.com - name: gianrubio email: gianrubio@gmail.com + - name: haad + email: adam.hamsik@lablabs.io diff --git a/stable/elasticsearch-curator/OWNERS b/stable/elasticsearch-curator/OWNERS index 89df1c0092..06238ae5e0 100644 --- a/stable/elasticsearch-curator/OWNERS +++ b/stable/elasticsearch-curator/OWNERS @@ -1,6 +1,8 @@ approvers: - desaintmartin - gianrubio + - haad reviewers: - desaintmartin - gianrubio + - haad diff --git a/stable/elasticsearch-curator/README.md b/stable/elasticsearch-curator/README.md index 7160feaa6c..73cb56fb98 100644 --- a/stable/elasticsearch-curator/README.md +++ b/stable/elasticsearch-curator/README.md @@ -52,6 +52,7 @@ their default values. | `cronjob.failedJobsHistoryLimit` | Specify the number of failed Jobs to keep | `nil` | | `cronjob.successfulJobsHistoryLimit` | Specify the number of completed Jobs to keep | `nil` | | `cronjob.jobRestartPolicy` | Control the Job restartPolicy | `Never` | +| `cronjob.startingDeadlineSeconds` | Amount of time to try reschedule job if we can't run on time| `nil` | | `pod.annotations` | Annotations to add to the pod | {} | | `pod.labels` | Labels to add to the pod | {} | | `dryrun` | Run Curator in dry-run mode | `false` | diff --git a/stable/elasticsearch-curator/templates/cronjob.yaml b/stable/elasticsearch-curator/templates/cronjob.yaml index c6bb50a31f..97a790f052 100644 --- a/stable/elasticsearch-curator/templates/cronjob.yaml +++ b/stable/elasticsearch-curator/templates/cronjob.yaml @@ -25,6 +25,9 @@ spec: {{- with .Values.cronjob.successfulJobsHistoryLimit }} successfulJobsHistoryLimit: {{ . }} {{- end }} + {{- with .Values.cronjob.startingDeadlineSeconds }} + startingDeadlineSeconds: {{ . }} + {{- end }} jobTemplate: metadata: labels: diff --git a/stable/elasticsearch-curator/values.yaml b/stable/elasticsearch-curator/values.yaml index c59f33de7e..511d8a9a7d 100644 --- a/stable/elasticsearch-curator/values.yaml +++ b/stable/elasticsearch-curator/values.yaml @@ -11,6 +11,7 @@ cronjob: failedJobsHistoryLimit: "" successfulJobsHistoryLimit: "" jobRestartPolicy: Never + startingDeadlineSeconds: "" pod: annotations: {}