diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml index f0ecc9bf19..d11fecef4b 100755 --- a/stable/jenkins/Chart.yaml +++ b/stable/jenkins/Chart.yaml @@ -1,6 +1,6 @@ name: jenkins home: https://jenkins.io/ -version: 1.1.9 +version: 1.1.10 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 index 6e4eff3867..74de4386da 100644 --- a/stable/jenkins/README.md +++ b/stable/jenkins/README.md @@ -175,6 +175,7 @@ Some third-party systems, e.g. GitHub, use HTML-formatted data in their payload | `agent.containerCap` | Maximum number of agent | 10 | | `agent.podName` | slave Pod base name | Not set | | `agent.idleMinutes` | Allows the Pod to remain active for reuse | 0 | +| `agent.yamlTemplate` | The raw yaml of a Pod API Object to merge into the agent spec | Not set | Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. diff --git a/stable/jenkins/templates/config.yaml b/stable/jenkins/templates/config.yaml index d7f6153286..d489b6a2fe 100644 --- a/stable/jenkins/templates/config.yaml +++ b/stable/jenkins/templates/config.yaml @@ -116,6 +116,9 @@ data: {{- end }} +{{- if .Values.agent.yamlTemplate }} + {{ tpl .Values.agent.yamlTemplate . | html | indent 4 | trim }} +{{- end }} {{- end -}} diff --git a/stable/jenkins/values.yaml b/stable/jenkins/values.yaml index 16381030b5..6df738aaa0 100644 --- a/stable/jenkins/values.yaml +++ b/stable/jenkins/values.yaml @@ -356,6 +356,18 @@ agent: # Allows the Pod to remain active for reuse until the configured number of # minutes has passed since the last step was executed on it. idleMinutes: 0 + # Raw yaml template for the Pod. For example this allows usage of toleration for agent pods. + # https://github.com/jenkinsci/kubernetes-plugin#using-yaml-to-define-pod-templates + # https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + yamlTemplate: + # yamlTemplate: |- + # apiVersion: v1 + # kind: Pod + # spec: + # tolerations: + # - key: "key" + # operator: "Equal" + # value: "value" persistence: enabled: true