From 71347880f37e62d38f54039cdd05179a1fe4be76 Mon Sep 17 00:00:00 2001
From: josebb <jose.bautista.barato@gmail.com>
Date: Wed, 2 Mar 2022 19:59:24 +0200
Subject: [PATCH] Add values for backoffLimit and restartPolicy in rally

Change-Id: I6a90e1c998e2785c4a28301d5ecbbacb5d6d9063
---
 rally/Chart.yaml                  | 2 +-
 rally/templates/job-run-task.yaml | 3 ++-
 rally/values.yaml                 | 5 +++++
 releasenotes/notes/rally.yaml     | 1 +
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/rally/Chart.yaml b/rally/Chart.yaml
index c54ee405b9..a7b1a87402 100644
--- a/rally/Chart.yaml
+++ b/rally/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm rally
 name: rally
-version: 0.2.1
+version: 0.2.2
 home: https://docs.openstack.org/developer/rally
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/rally/OpenStack_Project_rally_vertical.png
 sources:
diff --git a/rally/templates/job-run-task.yaml b/rally/templates/job-run-task.yaml
index e311df80e6..a757b611b9 100644
--- a/rally/templates/job-run-task.yaml
+++ b/rally/templates/job-run-task.yaml
@@ -25,13 +25,14 @@ metadata:
   annotations:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
+  backoffLimit: {{ .Values.jobs.run_tasks.backoffLimit }}
   template:
     metadata:
       labels:
 {{ tuple $envAll "rally" "run-task" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
     spec:
       serviceAccountName: {{ $serviceAccountName }}
-      restartPolicy: OnFailure
+      restartPolicy: {{ .Values.jobs.run_tasks.restartPolicy }}
       nodeSelector:
         {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }}
       initContainers:
diff --git a/rally/values.yaml b/rally/values.yaml
index 4adfb4bff3..e96a76d78f 100644
--- a/rally/values.yaml
+++ b/rally/values.yaml
@@ -141,6 +141,11 @@ bootstrap:
   script: |
     openstack token issue
 
+jobs:
+  run_tasks:
+    backoffLimit: 6
+    restartPolicy: OnFailure
+
 dependencies:
   dynamic:
     common:
diff --git a/releasenotes/notes/rally.yaml b/releasenotes/notes/rally.yaml
index 0a198fef25..6e1e215d96 100644
--- a/releasenotes/notes/rally.yaml
+++ b/releasenotes/notes/rally.yaml
@@ -4,4 +4,5 @@ rally:
   - 0.1.1 Change helm-toolkit dependency version to ">= 0.1.0"
   - 0.2.0 Remove support for releases before T
   - 0.2.1 Update htk requirements repo
+  - 0.2.2 Add values for backoffLimit and restartPolicy
 ...