Skip to content

Commit c5e42d8

Browse files
authored
Merge pull request #220 from cloudogu/feature/update-jenkins
Update Jenkins to 2.462.1 (Chart 5.5.1)
2 parents 1b4261e + 9b123a9 commit c5e42d8

File tree

4 files changed

+79
-77
lines changed

4 files changed

+79
-77
lines changed

jenkins/tmp-docker-gid-grepper.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ spec:
88
- sleep
99
- "Infinity"
1010
# Note: When upgrading, use same image as in initContainer create-agent-working-dir (values.yaml) for performance reasons
11-
image: bash:5-alpine3.19
11+
image: bash:5
1212
name: tmp-docker-gid-grepper
1313
volumeMounts:
1414
- name: group

jenkins/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ controller:
1111
registry: ghcr.io
1212
repository: cloudogu/jenkins-helm
1313
# Use same version here as in ApplicationConfigurator.groovy (config.jenkins['helm']['version'])
14-
tag: "5.1.0"
14+
tag: "5.5.11"
1515
installPlugins: false
1616

1717
# to prevent the jenkins-ui-test pod being created
@@ -61,7 +61,7 @@ controller:
6161
securityContext:
6262
runAsUser: 1000
6363
# Note: When upgrading, use same image as in gid-grepper for performance reasons
64-
image: bash:5-alpine3.19
64+
image: bash:5
6565
imagePullPolicy: "{{ .Values.controller.imagePullPolicy }}"
6666
command: [ "/usr/local/bin/bash", "-c" ]
6767
args:

scripts/jenkins/plugins/plugins.txt

Lines changed: 75 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,101 +1,104 @@
11
ace-editor:1.1
22
antisamy-markup-formatter:162.v0e6ec0fcfcf6
33
apache-httpcomponents-client-4-api:4.5.14-208.v438351942757
4-
apache-httpcomponents-client-5-api:5.3.1-1.0
5-
authentication-tokens:1.53.v1c90fd9191a_b_
4+
apache-httpcomponents-client-5-api:5.3.1-110.v77252fb_d4da_5
5+
asm-api:9.7-33.v4d23ef79fcc8
6+
authentication-tokens:1.119.v50285141b_7e1
67
bootstrap5-api:5.3.3-1
7-
bouncycastle-api:2.30.1.77-225.v26ea_c9455fd9
8-
branch-api:2.1152.v6f101e97dd77
8+
bouncycastle-api:2.30.1.78.1-248.ve27176eb_46cb_
9+
branch-api:2.1178.v969d9eb_c728e
910
caffeine-api:3.1.8-133.v17b_1ff2e0599
10-
checks-api:2.0.2
11+
checks-api:2.2.0
1112
cloud-stats:336.v788e4055508b_
12-
cloudbees-folder:6.901.vb_4c7a_da_75da_3
13-
command-launcher:107.v773860566e2e
14-
commons-lang3-api:3.13.0-62.v7d18e55f51e2
15-
commons-text-api:1.11.0-95.v22a_d30ee5d36
16-
configuration-as-code:1775.v810dc950b_514
17-
credentials:1337.v60b_d7b_c7b_c9f
18-
credentials-binding:657.v2b_19db_7d6e6d
19-
data-tables-api:2.0.1-1
20-
display-url-api:2.200.vb_9327d658781
21-
docker-commons:439.va_3cb_0a_6a_fb_29
22-
docker-java-api:3.3.4-86.v39b_a_5ede342c
23-
docker-plugin:1.6
24-
docker-workflow:572.v950f58993843
25-
durable-task:550.v0930093c4b_a_6
26-
echarts-api:5.5.0-1
13+
cloudbees-folder:6.942.vb_43318a_156b_2
14+
command-launcher:115.vd8b_301cc15d0
15+
commons-compress-api:1.26.1-2
16+
commons-lang3-api:3.16.0-82.ve2b_07d659d95
17+
commons-text-api:1.12.0-129.v99a_50df237f7
18+
configuration-as-code:1849.v3a_d20568000a_
19+
credentials:1371.vfee6b_095f0a_3
20+
credentials-binding:681.vf91669a_32e45
21+
data-tables-api:2.1.4-1
22+
display-url-api:2.204.vf6fddd8a_8b_e9
23+
docker-commons:443.v921729d5611d
24+
docker-java-api:3.3.6-90.ve7c5c7535ddd
25+
docker-plugin:1.6.2
26+
docker-workflow:580.vc0c340686b_54
27+
durable-task:568.v8fb_5c57e8417
28+
echarts-api:5.5.1-1
29+
eddsa-api:0.3.0-4.v84c6f0f4969e
2730
external-monitor-job:215.v2e88e894db_f8
28-
font-awesome-api:6.5.1-3
29-
git:5.2.1
30-
git-client:4.7.0
31-
git-server:114.v068a_c7cc2574
32-
gson-api:2.10.1-15.v0d99f670e0a_7
31+
font-awesome-api:6.6.0-1
32+
git:5.4.1
33+
git-client:5.0.0
34+
git-server:126.v0d945d8d2b_39
35+
gson-api:2.11.0-41.v019fcf6125dc
3336
html5-notifier-plugin:1.5
3437
instance-identity:185.v303dc7c645f9
35-
ionicons-api:56.v1b_1c8c49374e
36-
jackson2-api:2.16.2-378.v7e79818f53ce
38+
ionicons-api:74.v93d5eb_813d5f
39+
jackson2-api:2.17.0-379.v02de8ec9f64c
3740
jakarta-activation-api:2.1.3-1
3841
jakarta-mail-api:2.1.3-1
39-
javax-activation-api:1.2.0-6
40-
javax-mail-api:1.6.2-9
42+
javax-activation-api:1.2.0-7
43+
javax-mail-api:1.6.2-10
4144
jaxb:2.3.9-1
42-
jdk-tool:73.vddf737284550
45+
jdk-tool:80.v8a_dee33ed6f0
4346
joda-time-api:2.12.7-29.v5a_b_e3a_82269a_
4447
jquery3-api:3.7.1-2
4548
jsch:0.2.16-86.v42e010d9484b_
4649
json-api:20240303-41.v94e11e6de726
47-
json-path-api:2.9.0-33.v2527142f2e1d
48-
junit:1259.v65ffcef24a_88
49-
kubernetes:4193.vded98e56cc25
50+
json-path-api:2.9.0-58.v62e3e85b_a_655
51+
junit:1296.vb_f538b_c88630
52+
kubernetes:4285.v50ed5f624918
5053
kubernetes-client-api:6.10.0-240.v57880ce8b_0b_2
51-
kubernetes-credentials:0.11
52-
ldap:711.vb_d1a_491714dc
53-
lockable-resources:1243.v346d600eea_24
54+
kubernetes-credentials:189.v90a_488b_d1d65
55+
ldap:725.v3cb_b_711b_1a_ef
56+
lockable-resources:1255.vf48745da_35d0
5457
mailer:472.vf7c289a_4b_420
5558
matrix-auth:3.2.2
56-
matrix-project:822.824.v14451b_c0fd42
57-
metrics:4.2.21-449.v6960d7c54c69
58-
mina-sshd-api-common:2.12.0-90.v9f7fb_9fa_3d3b_
59-
mina-sshd-api-core:2.12.0-90.v9f7fb_9fa_3d3b_
59+
matrix-project:832.va_66e270d2946
60+
metrics:4.2.21-451.vd51df8df52ec
61+
mina-sshd-api-common:2.13.2-125.v200281b_61d59
62+
mina-sshd-api-core:2.13.2-125.v200281b_61d59
6063
okhttp-api:4.11.0-172.vda_da_1feeb_c6e
61-
pam-auth:1.10
64+
pam-auth:1.11
6265
pipeline-build-step:540.vb_e8849e1a_b_d8
6366
pipeline-graph-analysis:216.vfd8b_ece330ca_
64-
pipeline-groovy-lib:704.vc58b_8890a_384
65-
pipeline-input-step:491.vb_07d21da_1a_fb_
66-
pipeline-milestone-step:111.v449306f708b_7
67-
pipeline-model-api:2.2183.vb_36481468374
68-
pipeline-model-definition:2.2183.vb_36481468374
69-
pipeline-model-extensions:2.2183.vb_36481468374
67+
pipeline-groovy-lib:730.ve57b_34648c63
68+
pipeline-input-step:495.ve9c153f6067b_
69+
pipeline-milestone-step:119.vdfdc43fc3b_9a_
70+
pipeline-model-api:2.2214.vb_b_34b_2ea_9b_83
71+
pipeline-model-definition:2.2214.vb_b_34b_2ea_9b_83
72+
pipeline-model-extensions:2.2214.vb_b_34b_2ea_9b_83
7073
pipeline-rest-api:2.34
71-
pipeline-stage-step:305.ve96d0205c1c6
72-
pipeline-stage-tags-metadata:2.2183.vb_36481468374
74+
pipeline-stage-step:312.v8cd10304c27a_
75+
pipeline-stage-tags-metadata:2.2214.vb_b_34b_2ea_9b_83
7376
pipeline-stage-view:2.34
74-
pipeline-utility-steps:2.16.2
75-
plain-credentials:179.vc5cb_98f6db_38
77+
pipeline-utility-steps:2.17.0
78+
plain-credentials:183.va_de8f1dd5a_2b_
7679
plugin-util-api:4.1.0
7780
popper-api:1.16.1-3
78-
prism-api:1.29.0-13
79-
prometheus:2.5.1
80-
scm-api:683.vb_16722fb_b_80b_
81-
scm-manager:1.9.2
82-
script-security:1326.vdb_c154de8669
83-
snakeyaml-api:2.2-111.vc6598e30cc65
84-
ssh-credentials:322.v124df57ed808
85-
ssh-slaves:2.948.vb_8050d697fec
86-
sshd:3.322.v159e91f6a_550
87-
structs:337.v1b_04ea_4df7c8
81+
prism-api:1.29.0-17
82+
prometheus:784.vea_eca_f6592eb_
83+
scm-api:696.v778d637b_a_762
84+
scm-manager:1.9.4
85+
script-security:1354.va_70a_fe478c7f
86+
snakeyaml-api:2.2-121.v5a_68b_9300b_d4
87+
ssh-credentials:343.v884f71d78167
88+
ssh-slaves:2.973.v0fa_8c0dea_f9f
89+
sshd:3.330.vc866a_8389b_58
90+
structs:338.v848422169819
8891
token-macro:400.v35420b_922dcb_
89-
trilead-api:2.141.v284120fd0c46
92+
trilead-api:2.147.vb_73cc728a_32e
9093
variant:60.v7290fc0eb_b_cd
91-
workflow-aggregator:596.v8c21c963d92d
92-
workflow-api:1291.v51fd2a_625da_7
93-
workflow-basic-steps:1049.v257a_e6b_30fb_d
94-
workflow-cps:3883.vb_3ff2a_e3eea_f
94+
workflow-aggregator:600.vb_57cdd26fdd7
95+
workflow-api:1336.vee415d95c521
96+
workflow-basic-steps:1058.vcb_fc1e3a_21a_9
97+
workflow-cps:3953.v19f11da_8d2fa_
9598
workflow-cps-global-lib:612.v55f2f80781ef
96-
workflow-durable-task-step:1331.vc8c2fed35334
97-
workflow-job:1400.v7fd111b_ec82f
98-
workflow-multibranch:773.vc4fe1378f1d5
99-
workflow-scm-step:415.v434365564324
100-
workflow-step-api:657.v03b_e8115821b_
101-
workflow-support:865.v43e78cc44e0d
99+
workflow-durable-task-step:1371.vb_7cec8f3b_95e
100+
workflow-job:1436.vfa_244484591f
101+
workflow-multibranch:795.ve0cb_1f45ca_9a_
102+
workflow-scm-step:427.v4ca_6512e7df1
103+
workflow-step-api:678.v3ee58b_469476
104+
workflow-support:920.v59f71ce16f04

src/main/groovy/com/cloudogu/gitops/config/ApplicationConfigurator.groovy

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,9 @@ class ApplicationConfigurator {
7373
//repoURL: 'https://charts.jenkins.io',
7474
/* When Upgrading helm chart, also upgrade controller.tag in jenkins/values.yaml
7575
In addition:
76-
- Upgrade bash image in values.yaml and gid-grepper
7776
- Also upgrade plugins. See docs/developers.md
7877
*/
79-
version: '5.0.17'
78+
version: '5.5.11'
8079
],
8180
mavenCentralMirror: '',
8281
],

0 commit comments

Comments
 (0)