diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml index 3d5c4b5158c3..b37e4f3e005e 100644 --- a/stable/jenkins/Chart.yaml +++ b/stable/jenkins/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: jenkins home: https://jenkins.io/ -version: 1.23.2 +version: 1.24.0 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 9dc788bd2ca2..cf98b8881edb 100644 --- a/stable/jenkins/README.md +++ b/stable/jenkins/README.md @@ -237,6 +237,7 @@ Some third-party systems, e.g. GitHub, use HTML-formatted data in their payload | `agent.podName` | Agent 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 | +| `agent.yamlMergeStrategy | Defines how the raw yaml field gets merged with yaml definitions from inherited pod templates | `override` | | `agent.slaveConnectTimeout`| Timeout in seconds for an agent to be online | 100 | | `agent.podTemplates` | Configures extra pod templates for the default kubernetes cloud | `{}` | | `additionalAgents` | Configure additional agents which inherit values from `agent` | `{}` | diff --git a/stable/jenkins/templates/_helpers.tpl b/stable/jenkins/templates/_helpers.tpl index d97f8078c5a4..4596d3e5f242 100644 --- a/stable/jenkins/templates/_helpers.tpl +++ b/stable/jenkins/templates/_helpers.tpl @@ -243,7 +243,7 @@ Returns kubernetes pod template configuration as code yaml: |- {{- tpl (trim .Values.agent.yamlTemplate) . | nindent 4 }} {{- end }} - yamlMergeStrategy: "override" + yamlMergeStrategy: {{ .Values.agent.yamlMergeStrategy }} {{- end -}} {{/* diff --git a/stable/jenkins/values.yaml b/stable/jenkins/values.yaml index 1d968daa57f7..22705717cdfe 100644 --- a/stable/jenkins/values.yaml +++ b/stable/jenkins/values.yaml @@ -529,6 +529,8 @@ agent: # - key: "key" # operator: "Equal" # value: "value" + # Defines how the raw yaml field gets merged with yaml definitions from inherited pod templates: merge or override + yamlMergeStrategy: "override" # Timeout in seconds for an agent to be online slaveConnectTimeout: 100