From f20eff164f9de5c43e747826235662f9219eba58 Mon Sep 17 00:00:00 2001
From: "Parsons, Cliff (cp769u)" <cp769u@att.com>
Date: Mon, 29 Mar 2021 19:34:11 +0000
Subject: [PATCH] Allow Ceph RBD pool job to leave failed pods

This patchset will add the capability to configure the
Ceph RBD pool job to leave failed pods behind for debugging
purposes, if it is desired. Default is to not leave them
behind, which is the current behavior.

Change-Id: Ife63b73f89996d59b75ec617129818068b060d1c
---
 ceph-client/Chart.yaml                  | 2 +-
 ceph-client/templates/job-rbd-pool.yaml | 2 +-
 ceph-client/values.yaml                 | 2 ++
 releasenotes/notes/ceph-client.yaml     | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ceph-client/Chart.yaml b/ceph-client/Chart.yaml
index 45d584ec6..d562cbd35 100644
--- a/ceph-client/Chart.yaml
+++ b/ceph-client/Chart.yaml
@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph Client
 name: ceph-client
-version: 0.1.13
+version: 0.1.14
 home: https://github.com/ceph/ceph-client
 ...
diff --git a/ceph-client/templates/job-rbd-pool.yaml b/ceph-client/templates/job-rbd-pool.yaml
index 351ef761d..7d0fce2f9 100644
--- a/ceph-client/templates/job-rbd-pool.yaml
+++ b/ceph-client/templates/job-rbd-pool.yaml
@@ -35,7 +35,7 @@ spec:
     spec:
 {{ dict "envAll" $envAll "application" "rbd_pool" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
       serviceAccountName: {{ $serviceAccountName }}
-      restartPolicy: OnFailure
+      restartPolicy: {{ $envAll.Values.jobs.rbd_pool.restartPolicy | quote }}
       affinity:
 {{ tuple $envAll "ceph" "rbd-pool" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
       nodeSelector:
diff --git a/ceph-client/values.yaml b/ceph-client/values.yaml
index 555ed726e..dcb49b3fe 100644
--- a/ceph-client/values.yaml
+++ b/ceph-client/values.yaml
@@ -251,6 +251,8 @@ jobs:
       # Skip new job if previous job still active
       execPolicy: Forbid
     startingDeadlineSecs: 60
+  rbd_pool:
+    restartPolicy: OnFailure
 
 conf:
   features:
diff --git a/releasenotes/notes/ceph-client.yaml b/releasenotes/notes/ceph-client.yaml
index aa3e867a8..046a759b8 100644
--- a/releasenotes/notes/ceph-client.yaml
+++ b/releasenotes/notes/ceph-client.yaml
@@ -14,4 +14,5 @@ ceph-client:
   - 0.1.11 enhance logic to enable and disable the autoscaler
   - 0.1.12 Disable autoscaling before pools are created
   - 0.1.13 Fix ceph-client helm test
+  - 0.1.14 Allow Ceph RBD pool job to leave failed pods
 ...