Upgrade Jenkins and polishing

Minimize Jenkins plugins.

Deprecated:
workflow-cps-global-lib
html5-notifier-plugin

Provided by Jenkins image:
configuration-as-code
kubernetes

Likely not strictly necessary:
external-monitor-job
matrix-auth
lockable-resources

Co-authored-by: Niklas Hußmann <[email protected]>

Author: schnatterer

README.md

@@ -830,13 +830,6 @@ Jenkins is available at
 * http://localhost:9090 (k3d)
 * `scripts/get-remote-url jenkins default` (remote k8s)
 
-You can enable browser notifications about build results via a button in the lower right corner of Jenkins Web UI.
-
-Note that this only works when using `localhost` or `https://`.
-
-<img src="docs/jenkins-enable-notifications.png" alt="Enable Jenkins Notifications" width="300" >
-<img src="docs/jenkins-example-notification.png" alt="Example of a Jenkins browser notifications" width="300" >
-
 ###### External Jenkins
 
 You can set an external jenkins server via the following parameters when applying the playground.

docs/developers.md

@@ -114,6 +114,41 @@ Jenkins.instance.pluginManager.activePlugins.sort().each {
   * Make sure you have updated `plugins.txt` with working versions of the plugins
   * commit and push changes to your feature-branch and submit a pr
 
+Note that `plugins.txt` contains the whole dependency tree, including transitive plugin dependencies.
+The bare minimum of plugins that are needed is this:
+
+```shell
+docker-workflow # Used in example builds
+git # Used in example builds
+junit # Used in example builds
+pipeline-utility-steps # Used in example builds, by gitops-build-lib
+pipeline-stage-view # Only necessary for better visualization of the builds
+prometheus # Necessary to fill Jenkins dashboard in Grafana
+scm-manager # Used in example builds
+workflow-aggregator # Pipelines plugin, used in example builds
+```
+
+Note that, when running locally we also need `kubernetes` and `configuration-as-code` but these are contained in [our 
+jenkins helm image](https://github.com/cloudogu/jenkins-helm-image/blob/5.8.1-1/Dockerfile#L2) (extracted from the 
+[corresponding helm chart version](https://github.com/jenkinsci/helm-charts/blob/jenkins-5.8.1/charts/jenkins/values.yaml#L406-L409)).
+
+
+### Updating all plugins 
+To get a minimal list of plugins, start an empty jenkins that uses [the base image of our image](https://github.com/cloudogu/jenkins-helm-image/blob/main/Dockerfile):
+
+```shell
+docker run --rm -v $RANDOM-tmp-jenkins:/var/jenkins_home  jenkins/jenkins:2.479.2-jdk17
+```
+We need a volume to persist the plugins when jenkins restarts.  
+(These can be cleaned up afterwards like so: `docker volume ls -q | grep jenkins | xargs -I {} docker volume rm {}`).
+
+Then
+* manually install the bare minimum of plugins mentioned above
+* extract the plugins using the groovy console as mentioned above
+* Write the output into `plugins.txt`
+
+We should automate this!
+
 ## Local development
 
 * Run locally

docs/jenkins-enable-notifications.png

@@ -1,104 +1,74 @@
-ace-editor:1.1
-antisamy-markup-formatter:162.v0e6ec0fcfcf6
 apache-httpcomponents-client-4-api:4.5.14-208.v438351942757
-apache-httpcomponents-client-5-api:5.3.1-110.v77252fb_d4da_5
-asm-api:9.7-33.v4d23ef79fcc8
+asm-api:9.7.1-97.v4cc844130d97
 authentication-tokens:1.119.v50285141b_7e1
 bootstrap5-api:5.3.3-1
-bouncycastle-api:2.30.1.78.1-248.ve27176eb_46cb_
-branch-api:2.1178.v969d9eb_c728e
+bouncycastle-api:2.30.1.79-254.vfdb_814e7791e
+branch-api:2.1202.vc51412f3ed84
 caffeine-api:3.1.8-133.v17b_1ff2e0599
-checks-api:2.2.0
-cloud-stats:336.v788e4055508b_
-cloudbees-folder:6.942.vb_43318a_156b_2
-command-launcher:115.vd8b_301cc15d0
+checks-api:2.2.1
+cloudbees-folder:6.975.v4161e479479f
 commons-compress-api:1.26.1-2
-commons-lang3-api:3.16.0-82.ve2b_07d659d95
+commons-lang3-api:3.17.0-84.vb_b_938040b_078
 commons-text-api:1.12.0-129.v99a_50df237f7
-configuration-as-code:1849.v3a_d20568000a_
-credentials:1371.vfee6b_095f0a_3
-credentials-binding:681.vf91669a_32e45
-data-tables-api:2.1.4-1
-display-url-api:2.204.vf6fddd8a_8b_e9
-docker-commons:443.v921729d5611d
-docker-java-api:3.3.6-90.ve7c5c7535ddd
-docker-plugin:1.6.2
+credentials:1405.vb_cda_74a_f8974
+credentials-binding:687.v619cb_15e923f
+display-url-api:2.209.v582ed814ff2f
+docker-commons:445.v6b_646c962a_94
 docker-workflow:580.vc0c340686b_54
-durable-task:568.v8fb_5c57e8417
-echarts-api:5.5.1-1
+durable-task:581.v299a_5609d767
+echarts-api:5.5.1-5
 eddsa-api:0.3.0-4.v84c6f0f4969e
-external-monitor-job:215.v2e88e894db_f8
-font-awesome-api:6.6.0-1
-git:5.4.1
-git-client:5.0.0
-git-server:126.v0d945d8d2b_39
-gson-api:2.11.0-41.v019fcf6125dc
-html5-notifier-plugin:1.5
-instance-identity:185.v303dc7c645f9
+font-awesome-api:6.6.0-2
+git:5.7.0
+git-client:6.1.0
+gson-api:2.11.0-85.v1f4e87273c33
+instance-identity:201.vd2a_b_5a_468a_a_6
 ionicons-api:74.v93d5eb_813d5f
 jackson2-api:2.17.0-379.v02de8ec9f64c
 jakarta-activation-api:2.1.3-1
 jakarta-mail-api:2.1.3-1
 javax-activation-api:1.2.0-7
-javax-mail-api:1.6.2-10
 jaxb:2.3.9-1
-jdk-tool:80.v8a_dee33ed6f0
-joda-time-api:2.12.7-29.v5a_b_e3a_82269a_
+joda-time-api:2.13.0-93.v9934da_29b_a_e9
 jquery3-api:3.7.1-2
-jsch:0.2.16-86.v42e010d9484b_
-json-api:20240303-41.v94e11e6de726
-json-path-api:2.9.0-58.v62e3e85b_a_655
-junit:1296.vb_f538b_c88630
-kubernetes:4285.v50ed5f624918
-kubernetes-client-api:6.10.0-240.v57880ce8b_0b_2
-kubernetes-credentials:189.v90a_488b_d1d65
-ldap:725.v3cb_b_711b_1a_ef
-lockable-resources:1255.vf48745da_35d0
-mailer:472.vf7c289a_4b_420
-matrix-auth:3.2.2
-matrix-project:832.va_66e270d2946
-metrics:4.2.21-451.vd51df8df52ec
-mina-sshd-api-common:2.13.2-125.v200281b_61d59
-mina-sshd-api-core:2.13.2-125.v200281b_61d59
-okhttp-api:4.11.0-172.vda_da_1feeb_c6e
-pam-auth:1.11
+json-api:20241224-119.va_dca_a_b_ea_7da_5
+junit:1312.v1a_235a_b_94a_31
+mailer:489.vd4b_25144138f
+metrics:4.2.21-458.vcf496cb_839e4
+mina-sshd-api-common:2.14.0-138.v6341ee58e1df
+mina-sshd-api-core:2.14.0-138.v6341ee58e1df
+okhttp-api:4.11.0-183.va_87fc7a_89810
 pipeline-build-step:540.vb_e8849e1a_b_d8
 pipeline-graph-analysis:216.vfd8b_ece330ca_
-pipeline-groovy-lib:730.ve57b_34648c63
+pipeline-groovy-lib:745.vdf6077913de0
 pipeline-input-step:495.ve9c153f6067b_
 pipeline-milestone-step:119.vdfdc43fc3b_9a_
-pipeline-model-api:2.2214.vb_b_34b_2ea_9b_83
-pipeline-model-definition:2.2214.vb_b_34b_2ea_9b_83
-pipeline-model-extensions:2.2214.vb_b_34b_2ea_9b_83
+pipeline-model-api:2.2218.v56d0cda_37c72
+pipeline-model-definition:2.2218.v56d0cda_37c72
+pipeline-model-extensions:2.2218.v56d0cda_37c72
 pipeline-rest-api:2.34
 pipeline-stage-step:312.v8cd10304c27a_
-pipeline-stage-tags-metadata:2.2214.vb_b_34b_2ea_9b_83
+pipeline-stage-tags-metadata:2.2218.v56d0cda_37c72
 pipeline-stage-view:2.34
-pipeline-utility-steps:2.17.0
+pipeline-utility-steps:2.18.0
 plain-credentials:183.va_de8f1dd5a_2b_
-plugin-util-api:4.1.0
-popper-api:1.16.1-3
-prism-api:1.29.0-17
-prometheus:784.vea_eca_f6592eb_
-scm-api:696.v778d637b_a_762
+plugin-util-api:5.1.0
+prometheus:801.v98e119d8eeda_
+scm-api:698.v8e3b_c788f0a_6
 scm-manager:1.9.4
-script-security:1354.va_70a_fe478c7f
-snakeyaml-api:2.2-121.v5a_68b_9300b_d4
-ssh-credentials:343.v884f71d78167
-ssh-slaves:2.973.v0fa_8c0dea_f9f
-sshd:3.330.vc866a_8389b_58
+script-security:1369.v9b_98a_4e95b_2d
+snakeyaml-api:2.3-123.v13484c65210a_
+ssh-credentials:349.vb_8b_6b_9709f5b_
 structs:338.v848422169819
-token-macro:400.v35420b_922dcb_
 trilead-api:2.147.vb_73cc728a_32e
 variant:60.v7290fc0eb_b_cd
 workflow-aggregator:600.vb_57cdd26fdd7
 workflow-api:1336.vee415d95c521
 workflow-basic-steps:1058.vcb_fc1e3a_21a_9
-workflow-cps:3953.v19f11da_8d2fa_
-workflow-cps-global-lib:612.v55f2f80781ef
-workflow-durable-task-step:1371.vb_7cec8f3b_95e
-workflow-job:1436.vfa_244484591f
+workflow-cps:4007.vd705fc76a_34e
+workflow-durable-task-step:1398.vf6c9e89e5988
+workflow-job:1472.ve4d5eca_143c4
 workflow-multibranch:795.ve0cb_1f45ca_9a_
 workflow-scm-step:427.v4ca_6512e7df1
 workflow-step-api:678.v3ee58b_469476
-workflow-support:920.v59f71ce16f04
+workflow-support:936.v9fa_77211ca_e1

docs/jenkins-example-notification.png

@@ -153,7 +153,7 @@ class ApplicationConfigurator {
 
         if (newConfig.application.baseUrl) {
             newConfig.jenkins.ingress = new URL(injectSubdomain('jenkins',
-                    newConfig.application.baseUrl as String, newConfig.application.urlSeparatorHyphen as Boolean)).host
+                    newConfig.application.baseUrl, newConfig.application.urlSeparatorHyphen)).host
         }
     }
 

scripts/jenkins/plugins/plugins.txt

@@ -203,7 +203,7 @@ class Config {
         HelmConfigWithValues helm = new HelmConfigWithValues(
                 chart: 'jenkins',
                 repoURL: 'https://charts.jenkins.io',
-                version: '5.5.11')
+                version: '5.8.1')
     }
 
     static class ScmmSchema {

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

@@ -68,7 +68,7 @@ class Jenkins extends Feature {
     void enable() {
 
         if (config.jenkins.internal) {
-            // Mark the first node for Jenkins and agents. See jenkins/values.yaml "agent.workingDir" for details.
+            // Mark the first node for Jenkins and agents. See jenkins/values.ftl.yaml "agent.workingDir" for details.
             // Remove first (in case new nodes were added)
             k8sClient.labelRemove('node', '--all', '', 'node')
             def nodeName = k8sClient.waitForNode().replace('node/', '')
@@ -210,8 +210,8 @@ class Jenkins extends Feature {
         }
 
         if (!gid) {
-            log.warn 'Unable to determine Docker Group ID (GID). Jenkins Agent pods will run as root user (UID 0)!\n' +
-                    "Group docker not found in /etc/group:\n${etcGroup}"
+            log.warn('Unable to determine Docker Group ID (GID). Jenkins Agent pods will run as root user (UID 0)!\n' +
+                    "Group docker not found in /etc/group:\n${etcGroup}")
             return ''
         } else {
             log.debug("Using Docker Group ID (GID) ${gid} for Jenkins Agent pods")

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

@@ -13,7 +13,6 @@ import groovy.yaml.YamlSlurper
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.mockito.ArgumentCaptor
-
 import java.nio.file.Path
 
 import static org.assertj.core.api.Assertions.assertThat