Merge "Allow Ceph RBD pool job to leave failed pods"

2021-03-30 08:04:06 +00:00 · 2021-03-30 08:04:06 +00:00 · 7351586a7d
parent 3ef3ad1432 f20eff164f
commit 7351586a7d
4 changed files with 5 additions and 2 deletions
--- 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
 ...
--- 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:
--- 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:
--- 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
 ...