Add option for setting annotations to the pod template (#101)

Signed-off-by: Torsten Walter <[email protected]>
jenkinsci · Oct 21, 2020 · f0b7414 · f0b7414
1 parent 46a857e
commit f0b7414
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 1 deletion.
diff --git a/charts/jenkins/CHANGELOG.md b/charts/jenkins/CHANGELOG.md
@@ -10,6 +10,10 @@ Use the following links to reference issues, PRs, and commits prior to v2.6.0.
 
 The change log 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.
 
+## 2.14.0
+
+Added support for annotations in podTemplates
+
 ## 2.13.2
 
 Add nodeSelector in the backup pod

diff --git a/charts/jenkins/Chart.yaml b/charts/jenkins/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: jenkins
 home: https://jenkins.io/
-version: 2.13.2
+version: 2.14.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/charts/jenkins/VALUES_SUMMARY.md b/charts/jenkins/VALUES_SUMMARY.md
@@ -266,6 +266,7 @@ The following tables list the configurable parameters of the Jenkins chart and t
 | `agent.volumes`            | Additional volumes                              | `[]`                   |
 | `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.annotations`       | Annotations to apply to the pod                  | `{}`                   |
 
 #### Side Container Configuration
 | Parameter                  | Description                                     | Default                |

diff --git a/charts/jenkins/templates/_helpers.tpl b/charts/jenkins/templates/_helpers.tpl
@@ -173,6 +173,13 @@ Returns kubernetes pod template configuration as code
 */}}
 {{- define "jenkins.casc.podTemplate" -}}
 - name: "{{ .Values.agent.podName }}"
+{{- if .Values.agent.annotations }}
+  annotations:
+  {{- range $key, $value := .Values.agent.annotations }}
+  - key: {{ $key }}
+    value: {{ $value | quote }}
+  {{- end }}
+{{- end }}
   containers:
   - name: "{{ .Values.agent.sideContainerName }}"
     alwaysPullImage: {{ .Values.agent.alwaysPullImage }}

diff --git a/charts/jenkins/tests/jcasc-config-test.yaml b/charts/jenkins/tests/jcasc-config-test.yaml
@@ -351,6 +351,8 @@ tests:
           defaultMode: "600"
           mountPath: /var/myapp/mysecret
           secretName: mysecret
+        annotations:
+          ci.jenkins-agent/test: "custom"
         yamlTemplate: |-
           apiVersion: v1
           kind: Pod
@@ -442,6 +444,9 @@ tests:
                     value: "true"
                   templates:
                     - name: "my-agent"
+                      annotations:
+                      - key: ci.jenkins-agent/test
+                        value: "custom"
                       containers:
                       - name: "sideContainer"
                         alwaysPullImage: true

diff --git a/charts/jenkins/values.yaml b/charts/jenkins/values.yaml
@@ -578,6 +578,8 @@ agent:
   yamlMergeStrategy: "override"
   # Timeout in seconds for an agent to be online
   slaveConnectTimeout: 100
+  # Annotations to apply to the pod.
+  annotations: {}
 
   # Below is the implementation of custom pod templates for the default configured kubernetes cloud.
   # Add a key under podTemplates for each pod template. Each key (prior to | character) is just a label, and can be any value.