From e614c1033d287bf3b2913d48c757f177ca55662f Mon Sep 17 00:00:00 2001
From: Jakub Jursa <jakub.jursa1@gmail.com>
Date: Tue, 14 Aug 2018 19:12:04 +0200
Subject: [PATCH] [stable/jenkins] make pod retention policy setting
 configurable (#6962)

* [stable/jenkins] make pod retention policy setting configurable

* [stable/jenkins] Bump helm chart version to 0.16.19
---
 stable/jenkins/Chart.yaml            | 2 +-
 stable/jenkins/templates/config.yaml | 2 ++
 stable/jenkins/values.yaml           | 3 +++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml
index f00511f7ba..dcce03849a 100755
--- a/stable/jenkins/Chart.yaml
+++ b/stable/jenkins/Chart.yaml
@@ -1,6 +1,6 @@
 name: jenkins
 home: https://jenkins.io/
-version: 0.16.18
+version: 0.16.19
 appVersion: 2.121.2
 description: Open source continuous integration server. It supports multiple SCM tools
   including CVS, Subversion and Git. It can execute Apache Ant and Apache Maven-based
diff --git a/stable/jenkins/templates/config.yaml b/stable/jenkins/templates/config.yaml
index 66b3e220ce..6dee07bd82 100644
--- a/stable/jenkins/templates/config.yaml
+++ b/stable/jenkins/templates/config.yaml
@@ -94,6 +94,7 @@ data:
               <imagePullSecrets/>
 {{- end }}
               <nodeProperties/>
+              <podRetention class="org.csanchez.jenkins.plugins.kubernetes.pod.retention.Default"/>
             </org.csanchez.jenkins.plugins.kubernetes.PodTemplate>
 {{- end -}}
           </templates>
@@ -106,6 +107,7 @@ data:
           <retentionTimeout>5</retentionTimeout>
           <connectTimeout>0</connectTimeout>
           <readTimeout>0</readTimeout>
+          <podRetention class="org.csanchez.jenkins.plugins.kubernetes.pod.retention.{{ .Values.Agent.PodRetention }}"/>
         </org.csanchez.jenkins.plugins.kubernetes.KubernetesCloud>
       </clouds>
       <quietPeriod>5</quietPeriod>
diff --git a/stable/jenkins/values.yaml b/stable/jenkins/values.yaml
index e5f459a192..8df9da9ca4 100644
--- a/stable/jenkins/values.yaml
+++ b/stable/jenkins/values.yaml
@@ -142,6 +142,9 @@ Agent:
       memory: "256Mi"
   # You may want to change this to true while testing a new image
   AlwaysPullImage: false
+  # Controls how slave pods are retained after the Jenkins build completes
+  # Possible values: Always, Never, OnFailure
+  PodRetention: Never
   # You can define the volumes that you want to mount for this container
   # Allowed types are: ConfigMap, EmptyDir, HostPath, Nfs, Pod, Secret
   # Configure the attributes as they appear in the corresponding Java class for that type