From c7b1f8b50d1b81c82ba1f02f402254599b79ae46 Mon Sep 17 00:00:00 2001
From: "Gupta, Sangeet (sg774j)" <sg774j@att.com>
Date: Wed, 6 Mar 2019 08:52:24 -0600
Subject: [PATCH] MARIADB: Job failure policy

Added backoffLimit to exporter-create-sql-user job so that it
keeps retrying to restart the pod incase of an error. Also added
activeDeadlineSeconds for the pod created by this job to terminate
if it does not become ready in one hour.

Change-Id: Ib6214a887f959fed84108884c8d286624d2f164f
---
 .../monitoring/prometheus/exporter-job-create-user.yaml      | 2 ++
 mariadb/values.yaml                                          | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/mariadb/templates/monitoring/prometheus/exporter-job-create-user.yaml b/mariadb/templates/monitoring/prometheus/exporter-job-create-user.yaml
index 9f67ac1bd..6f9decce6 100644
--- a/mariadb/templates/monitoring/prometheus/exporter-job-create-user.yaml
+++ b/mariadb/templates/monitoring/prometheus/exporter-job-create-user.yaml
@@ -25,6 +25,7 @@ kind: Job
 metadata:
   name: exporter-create-sql-user
 spec:
+  backoffLimit: {{ .Values.jobs.exporter_create_sql_user.backoffLimit }}
   template:
     metadata:
       labels:
@@ -32,6 +33,7 @@ spec:
     spec:
       shareProcessNamespace: true
       serviceAccountName: {{ $serviceAccountName }}
+      activeDeadlineSeconds: {{ .Values.jobs.exporter_create_sql_user.activeDeadlineSeconds }}
       restartPolicy: OnFailure
       nodeSelector:
         {{ .Values.labels.prometheus_mysql_exporter.node_selector_key }}: {{ .Values.labels.prometheus_mysql_exporter.node_selector_value }}
diff --git a/mariadb/values.yaml b/mariadb/values.yaml
index bdce15ca6..046ed9cbb 100644
--- a/mariadb/values.yaml
+++ b/mariadb/values.yaml
@@ -120,6 +120,11 @@ pod:
           memory: "1024Mi"
           cpu: "2000m"
 
+jobs:
+  exporter_create_sql_user:
+    backoffLimit: 87600
+    activeDeadlineSeconds: 3600
+
 dependencies:
   dynamic:
     common: