Skip to content

Commit 48a52aa

Browse files
timjatimja
authored
Revert "Fix Jenkins Helm Chart JCasC Configuration Issue with defaultConfig: false (#1443)" (#1472)
1 parent 792c064 commit 48a52aa

File tree

6 files changed

+192
-149
lines changed

6 files changed

+192
-149
lines changed

‎charts/jenkins/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ Use the following links to reference issues, PRs, and commits prior to v2.6.0.
1212
The changelog until v1.5.7 was auto-generated based on git commits.
1313
Those entries include a reference to the git commit to be able to get more details.
1414

15+
## 5.8.83
16+
17+
Revert `defaultConfig=false` changes, see [#1470](https://github.com/jenkinsci/helm-charts/issues/1470).
18+
1519
## 5.8.82
1620

1721
Update `jenkins/jenkins` to version `2.516.2-jdk21`

‎charts/jenkins/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: jenkins
33
type: application
44
home: https://www.jenkins.io/
5-
version: 5.8.82
5+
version: 5.8.83
66
appVersion: 2.516.2
77
description: >
88
Jenkins - Build great things at any scale! As the leading open source automation server, Jenkins provides over 2000 plugins to support building, deploying and automating any project.

‎charts/jenkins/templates/jcasc-config.yaml

Lines changed: 55 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{- $root := . }}
2-
{{- if and .Values.controller.sidecars.configAutoReload.enabled (not .Values.controller.JCasC.defaultConfig) }}
2+
{{- if .Values.controller.sidecars.configAutoReload.enabled }}
33
{{- range $key, $val := .Values.controller.JCasC.configScripts }}
44
{{- if $val }}
55
---
@@ -20,7 +20,6 @@ data:
2020
{{ tpl $val $| indent 4 }}
2121
{{- end }}
2222
{{- end }}
23-
{{- end }}
2423
{{- if .Values.controller.JCasC.defaultConfig }}
2524
---
2625
apiVersion: v1
@@ -38,6 +37,58 @@ metadata:
3837
data:
3938
jcasc-default-config.yaml: |-
4039
{{- include "jenkins.casc.defaults" . | nindent 4 }}
41-
{{- else }}
42-
{{- /* When defaultConfig is false, only process configScripts - no individual security ConfigMaps */}}
40+
{{- end}}
41+
{{- $configScripts := toYaml .Values.controller.JCasC.configScripts }}
42+
{{- if and .Values.controller.JCasC.securityRealm (not (contains "securityRealm:" $configScripts)) (not .Values.controller.JCasC.defaultConfig) }}
43+
---
44+
apiVersion: v1
45+
kind: ConfigMap
46+
metadata:
47+
name: {{ template "jenkins.casc.configName" (list "config-securityrealm" $ )}}
48+
namespace: {{ template "jenkins.namespace" $root }}
49+
labels:
50+
"app.kubernetes.io/name": {{ template "jenkins.name" $root}}
51+
{{- if .Values.renderHelmLabels }}
52+
"helm.sh/chart": "{{ $root.Chart.Name }}-{{ $root.Chart.Version | replace "+" "_" }}"
53+
{{- end }}
54+
"app.kubernetes.io/managed-by": "{{ $.Release.Service }}"
55+
"app.kubernetes.io/instance": "{{ $.Release.Name }}"
56+
"app.kubernetes.io/component": "{{ $.Values.controller.componentName }}"
57+
{{ template "jenkins.fullname" $root }}-jenkins-config: "true"
58+
{{- if $root.Values.controller.JCasC.configMapAnnotations }}
59+
annotations:
60+
{{ toYaml $root.Values.controller.JCasC.configMapAnnotations | indent 4 }}
61+
{{- end }}
62+
data:
63+
securityrealm.yaml: |-
64+
jenkins:
65+
securityRealm:
66+
{{- tpl .Values.controller.JCasC.securityRealm . | nindent 8 }}
67+
{{- end }}
68+
{{- if and .Values.controller.JCasC.authorizationStrategy (not (contains "authorizationStrategy:" $configScripts)) (not .Values.controller.JCasC.defaultConfig) }}
69+
---
70+
apiVersion: v1
71+
kind: ConfigMap
72+
metadata:
73+
name: {{ template "jenkins.casc.configName" (list "config-authorizationstrategy" $ )}}
74+
namespace: {{ template "jenkins.namespace" $root }}
75+
labels:
76+
"app.kubernetes.io/name": {{ template "jenkins.name" $root}}
77+
{{- if .Values.renderHelmLabels }}
78+
"helm.sh/chart": "{{ $root.Chart.Name }}-{{ $root.Chart.Version | replace "+" "_" }}"
79+
{{- end }}
80+
"app.kubernetes.io/managed-by": "{{ $.Release.Service }}"
81+
"app.kubernetes.io/instance": "{{ $.Release.Name }}"
82+
"app.kubernetes.io/component": "{{ $.Values.controller.componentName }}"
83+
{{ template "jenkins.fullname" $root }}-jenkins-config: "true"
84+
{{- if $root.Values.controller.JCasC.configMapAnnotations }}
85+
annotations:
86+
{{ toYaml $root.Values.controller.JCasC.configMapAnnotations | indent 4 }}
87+
{{- end }}
88+
data:
89+
authorizationstrategy.yaml: |-
90+
jenkins:
91+
authorizationStrategy:
92+
{{- tpl .Values.controller.JCasC.authorizationStrategy . | nindent 8 }}
93+
{{- end }}
4394
{{- end }}

‎charts/jenkins/unittests/garbage-collect-test.yaml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,14 @@ tests:
1313
of: ConfigMap
1414
- hasDocuments:
1515
count: 1
16-
- documentIndex: 0
17-
isNotEmpty:
16+
- isNotEmpty:
1817
path: data["jcasc-default-config.yaml"]
1918
- matchRegex:
2019
path: metadata.labels["helm.sh/chart"]
2120
pattern: ^jenkins-
22-
- documentIndex: 0
23-
matchSnapshot:
21+
- matchSnapshot:
2422
path: data["jcasc-default-config.yaml"]
25-
- documentIndex: 0
26-
equal:
23+
- equal:
2724
path: metadata.namespace
2825
value: my-namespace
2926

@@ -36,14 +33,12 @@ tests:
3633
of: ConfigMap
3734
- hasDocuments:
3835
count: 1
39-
- documentIndex: 0
40-
isNotEmpty:
36+
- isNotEmpty:
4137
path: data["jcasc-default-config.yaml"]
4238
- matchRegex:
4339
path: metadata.labels["helm.sh/chart"]
4440
pattern: ^jenkins-
45-
- documentIndex: 0
46-
matchSnapshot:
41+
- matchSnapshot:
4742
path: data["jcasc-default-config.yaml"]
4843
- equal:
4944
path: metadata.namespace
@@ -60,16 +55,13 @@ tests:
6055
of: ConfigMap
6156
- hasDocuments:
6257
count: 1
63-
- documentIndex: 0
64-
isNotEmpty:
58+
- isNotEmpty:
6559
path: data["jcasc-default-config.yaml"]
6660
- matchRegex:
6761
path: metadata.labels["helm.sh/chart"]
6862
pattern: ^jenkins-
69-
- documentIndex: 0
70-
matchSnapshot:
63+
- matchSnapshot:
7164
path: data["jcasc-default-config.yaml"]
72-
- documentIndex: 0
73-
equal:
65+
- equal:
7466
path: metadata.namespace
7567
value: my-namespace

‎charts/jenkins/unittests/instance-cap-test.yaml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,14 @@ tests:
1111
of: ConfigMap
1212
- hasDocuments:
1313
count: 1
14-
- documentIndex: 0
15-
isNotEmpty:
14+
- isNotEmpty:
1615
path: data["jcasc-default-config.yaml"]
1716
- matchRegex:
1817
path: metadata.labels["helm.sh/chart"]
1918
pattern: ^jenkins-
20-
- documentIndex: 0
21-
matchSnapshot:
19+
- matchSnapshot:
2220
path: data["jcasc-default-config.yaml"]
23-
- documentIndex: 0
24-
equal:
21+
- equal:
2522
path: metadata.namespace
2623
value: my-namespace
2724

@@ -33,16 +30,13 @@ tests:
3330
of: ConfigMap
3431
- hasDocuments:
3532
count: 1
36-
- documentIndex: 0
37-
isNotEmpty:
33+
- isNotEmpty:
3834
path: data["jcasc-default-config.yaml"]
3935
- matchRegex:
4036
path: metadata.labels["helm.sh/chart"]
4137
pattern: ^jenkins-
42-
- documentIndex: 0
43-
matchSnapshot:
38+
- matchSnapshot:
4439
path: data["jcasc-default-config.yaml"]
45-
- documentIndex: 0
46-
equal:
40+
- equal:
4741
path: metadata.namespace
4842
value: my-namespace

0 commit comments

Comments
 (0)