Allow configuring terminationGracePeriodSeconds (helm#21072)

Signed-off-by: Jocelyn Lussier <jocelyn.lussier2@montreal.ca> Signed-off-by: Adrien Loiseau <adrien.loiseau@logic-immo.com>
li-adrienloiseau · Jul 29, 2020 · 389f3a4 · 389f3a4
1 parent 6389a59
commit 389f3a4
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 2 deletions.
diff --git a/stable/jenkins/CHANGELOG.md b/stable/jenkins/CHANGELOG.md
@@ -5,6 +5,10 @@ numbering uses [semantic versioning](http://semver.org).
 
 NOTE: The change log until version 1.5.7 is auto generated based on git commits. Those include a reference to the git commit to be able to get more details.
 
+## 1.9.21
+
+Add `master.terminationGracePeriodSeconds` option
+
 ## 1.9.20
 
 Update default plugins
@@ -16,7 +20,6 @@ Update default plugins
 - git:4.2.0
 - configuration-as-code:1.36
 
-
 ## 1.9.19
 
 Update docs for Helm 3

diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: jenkins
 home: https://jenkins.io/
-version: 1.9.20
+version: 1.9.21
 appVersion: lts
 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/README.md b/stable/jenkins/README.md
@@ -152,6 +152,7 @@ The following tables list the configurable parameters of the Jenkins chart and t
 | `master.nodeSelector`             | Node labels for pod assignment       | `{}`                                      |
 | `master.affinity`                 | Affinity settings                    | `{}`                                      |
 | `master.schedulerName`            | Kubernetes scheduler name            | Not set                                   |
+| `master.terminationGracePeriodSeconds` | Set TerminationGracePeriodSeconds   | Not set                               |
 | `master.tolerations`              | Toleration labels for pod assignment | `[]`                                      |
 | `master.podAnnotations`           | Annotations for master pod           | `{}`                                      |
 | `master.deploymentAnnotations`           | Annotations for master deployment           | `{}`                                      |

diff --git a/stable/jenkins/templates/jenkins-master-deployment.yaml b/stable/jenkins/templates/jenkins-master-deployment.yaml
@@ -62,6 +62,9 @@ spec:
       {{- if .Values.master.affinity }}
       affinity:
 {{ toYaml .Values.master.affinity | indent 8 }}
+      {{- end }}
+      {{- if quote .Values.master.terminationGracePeriodSeconds }}
+      terminationGracePeriodSeconds: {{ .Values.master.terminationGracePeriodSeconds }}
       {{- end }}
       {{- if and (.Capabilities.APIVersions.Has "scheduling.k8s.io/v1beta1") (.Values.master.priorityClassName) }}
       priorityClassName: {{ .Values.master.priorityClassName }}

diff --git a/stable/jenkins/values.yaml b/stable/jenkins/values.yaml
@@ -318,6 +318,9 @@ master:
   # ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector
   # ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#taints-and-tolerations-beta-feature
   nodeSelector: {}
+
+  terminationGracePeriodSeconds:
+
   tolerations: []
   # Leverage a priorityClass to ensure your pods survive resource shortages
   # ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/