Merge branch 'main' into patch-1

jenkinsci · Aug 13, 2024 · d6c2a2f · d6c2a2f
2 parents 10d3a26 + 27f7d61
commit d6c2a2f
Show file tree

Hide file tree

Showing 10 changed files with 366 additions and 145 deletions.
diff --git a/.github/workflows/renovate.yaml b/.github/workflows/renovate.yaml
@@ -26,7 +26,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Self-hosted Renovate
-        uses: renovatebot/[email protected].5
+        uses: renovatebot/[email protected].6
         with:
           token: "${{ steps.get_token.outputs.token }}"
           docker-cmd-file: .github/renovate-entrypoint.sh

diff --git a/charts/jenkins/CHANGELOG.md b/charts/jenkins/CHANGELOG.md
@@ -12,11 +12,20 @@ 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.
 
-## 5.5.6
+## 5.5.8
 
 An explicit ‘agent-listener’ section has been added to the service,  
 aligning with the existing section in the StatefulSet manifest.
 
+## 5.5.7
+
+Update `kubernetes` to version `4285.v50ed5f624918`
+
+## 5.5.6
+
+Add `agent.useDefaultServiceAccount` to support omitting setting `serviceAccount` in the default pod template from `serviceAgentAccount.name`.
+Add `agent.serviceAccount` to support setting the default pod template value.
+
 ## 5.5.5
 
 Update `jenkins/inbound-agent` to version `3261.v9c670a_4748a_9-1`

diff --git a/charts/jenkins/Chart.yaml b/charts/jenkins/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: jenkins
 type: application
 home: https://www.jenkins.io/
-version: 5.5.6
+version: 5.5.8
 appVersion: 2.462.1
 description: >
   Jenkins - Build great things at any scale! As the leading open source automation server, Jenkins provides over 1800 plugins to support building, deploying and automating any project.

diff --git a/charts/jenkins/VALUES.md b/charts/jenkins/VALUES.md
diff --git a/charts/jenkins/templates/_helpers.tpl b/charts/jenkins/templates/_helpers.tpl
@@ -475,7 +475,10 @@ Returns kubernetes pod template configuration as code
   nodeUsageMode: {{ quote .Values.agent.nodeUsageMode }}
   podRetention: {{ .Values.agent.podRetention }}
   showRawYaml: {{ .Values.agent.showRawYaml }}
-  serviceAccount: "{{ include "jenkins.serviceAccountAgentName" . }}"
+{{- $asaname := default (include "jenkins.serviceAccountAgentName" .) .Values.agent.serviceAccount -}}
+{{- if or (.Values.agent.useDefaultServiceAccount) (.Values.agent.serviceAccount) }}
+  serviceAccount: "{{ $asaname }}"
+{{- end }}
   slaveConnectTimeoutStr: "{{ .Values.agent.connectTimeout }}"
 {{- if .Values.agent.volumes }}
   volumes:

diff --git a/charts/jenkins/unittests/__snapshot__/config-test.yaml.snap b/charts/jenkins/unittests/__snapshot__/config-test.yaml.snap
@@ -1,15 +1,15 @@
 additional plugins config:
   1: |
     |-
-      kubernetes:4280.vd919fa_528c7e
+      kubernetes:4285.v50ed5f624918
       workflow-aggregator:600.vb_57cdd26fdd7
       git:5.3.0
       configuration-as-code:1836.vccda_4a_122a_a_e
       kubernetes-credentials-provider
 default config:
   1: |
     |-
-      kubernetes:4280.vd919fa_528c7e
+      kubernetes:4285.v50ed5f624918
       workflow-aggregator:600.vb_57cdd26fdd7
       git:5.3.0
       configuration-as-code:1836.vccda_4a_122a_a_e