Support retentionTimeout and waitForPodSec

charts/jenkins/CHANGELOG.md

@@ -12,6 +12,10 @@ Use the following links to reference issues, PRs, and commits prior to v2.6.0.
 The changelog until v1.5.7 was auto-generated based on git commits.
 Those entries include a reference to the git commit to be able to get more details.
 
+## 4.8.2
+
+Add the ability to modify `retentionTimeout` and `waitForPodSec` default value in JCasC
+
 ## 4.8.1
 
 Reintroduces changes from 4.7.0 (reverted in 4.7.1), with additional fixes:
@@ -43,7 +47,6 @@ Runs `config-reload` as an init container, in addition to the sidecar container,
 
 Change jenkins-test image label to match the other jenkins images
 
-
 ## 4.6.5
 
 Update Jenkins image and appVersion to jenkins lts release version 2.414.2

charts/jenkins/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: jenkins
 home: https://jenkins.io/
-version: 4.8.1
+version: 4.8.2
 appVersion: 2.414.3
 description: Jenkins - Build great things at any scale! The leading open source automation server, Jenkins provides over 1800 plugins to support building, deploying and automating any project.
 sources:

charts/jenkins/README.md

@@ -297,6 +297,22 @@ agent:
 ```
 This will change the configuration of the kubernetes "cloud" (as called by jenkins) that is created automatically as part of this helm chart.
 
+### Change container cleanup timeout API
+For tasks that use very large images, this timeout can be increased to avoid early termination of the task while the Kubernetes pod is still deploying.
+```yaml
+agent:
+  retentionTimeout: "32"
+```
+This will change the configuration of the kubernetes "cloud" (as called by jenkins) that is created automatically as part of this helm chart.
+
+### Change seconds to wait for pod to be running
+This will change how long Jenkins will wait (seconds) for pod to be in running state.
+```yaml
+agent:
+  waitForPodSec: "32"
+```
+This will change the configuration of the kubernetes "cloud" (as called by jenkins) that is created automatically as part of this helm chart.
+
 ### Mounting Volumes into Agent Pods
 
 Your Jenkins Agents will run as pods, and it's possible to inject volumes where needed:

charts/jenkins/VALUES_SUMMARY.md

@@ -314,6 +314,8 @@ The following tables list the configurable parameters of the Jenkins chart and t
 | `agent.kubernetesConnectTimeout` | The connection timeout in seconds for connections to Kubernetes API. Minimum value is 5. | 5 |
 | `agent.kubernetesReadTimeout` | The read timeout in seconds for connections to Kubernetes API. Minimum value is 15.      | 15 |
 | `agent.maxRequestsPerHostStr` | The maximum concurrent connections to Kubernetes API                                     | 32 |
+| `agent.retentionTimeout`      | Time in minutes after which the Kubernetes cloud plugin will clean up an idle worker that has not already terminated | 5 |
+| `agent.waitForPodSec`         | Seconds to wait for pod to be running                                                    | 600 |
 | `agent.podLabels`             | Custom Pod labels (an object with `label-key: label-value` pairs)                        | Not set                         |
 | `agent.jnlpregistry`          | Custom docker registry used for to get agent jnlp image                                  | Not set                         |
 

charts/jenkins/templates/_helpers.tpl

@@ -165,6 +165,8 @@ jenkins:
       {{- end }}
       {{- end }}
       maxRequestsPerHostStr: {{ .Values.agent.maxRequestsPerHostStr | quote }}
+      retentionTimeout: {{ .Values.agent.retentionTimeout | quote }}
+      waitForPodSec: {{ .Values.agent.waitForPodSec | quote }}
       name: "{{ .Values.controller.cloudName }}"
       namespace: "{{ template "jenkins.agent.namespace" . }}"
       serverUrl: "{{ .Values.kubernetesURL }}"