diff --git a/jenkins/tmp-docker-gid-grepper.yaml b/jenkins/tmp-docker-gid-grepper.yaml index 0c99b23e..0d71d467 100644 --- a/jenkins/tmp-docker-gid-grepper.yaml +++ b/jenkins/tmp-docker-gid-grepper.yaml @@ -8,7 +8,7 @@ spec: - sleep - "Infinity" # Note: When upgrading, use same image as in initContainer create-agent-working-dir (values.yaml) for performance reasons - image: bash:5-alpine3.19 + image: bash:5 name: tmp-docker-gid-grepper volumeMounts: - name: group diff --git a/jenkins/values.yaml b/jenkins/values.yaml index ef847e23..74eb0982 100644 --- a/jenkins/values.yaml +++ b/jenkins/values.yaml @@ -11,7 +11,7 @@ controller: registry: ghcr.io repository: cloudogu/jenkins-helm # Use same version here as in ApplicationConfigurator.groovy (config.jenkins['helm']['version']) - tag: "5.1.0" + tag: "5.5.11" installPlugins: false # to prevent the jenkins-ui-test pod being created @@ -61,7 +61,7 @@ controller: securityContext: runAsUser: 1000 # Note: When upgrading, use same image as in gid-grepper for performance reasons - image: bash:5-alpine3.19 + image: bash:5 imagePullPolicy: "{{ .Values.controller.imagePullPolicy }}" command: [ "/usr/local/bin/bash", "-c" ] args: diff --git a/scripts/jenkins/plugins/plugins.txt b/scripts/jenkins/plugins/plugins.txt index 50a59fdb..33982d12 100644 --- a/scripts/jenkins/plugins/plugins.txt +++ b/scripts/jenkins/plugins/plugins.txt @@ -1,101 +1,104 @@ 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-1.0 -authentication-tokens:1.53.v1c90fd9191a_b_ +apache-httpcomponents-client-5-api:5.3.1-110.v77252fb_d4da_5 +asm-api:9.7-33.v4d23ef79fcc8 +authentication-tokens:1.119.v50285141b_7e1 bootstrap5-api:5.3.3-1 -bouncycastle-api:2.30.1.77-225.v26ea_c9455fd9 -branch-api:2.1152.v6f101e97dd77 +bouncycastle-api:2.30.1.78.1-248.ve27176eb_46cb_ +branch-api:2.1178.v969d9eb_c728e caffeine-api:3.1.8-133.v17b_1ff2e0599 -checks-api:2.0.2 +checks-api:2.2.0 cloud-stats:336.v788e4055508b_ -cloudbees-folder:6.901.vb_4c7a_da_75da_3 -command-launcher:107.v773860566e2e -commons-lang3-api:3.13.0-62.v7d18e55f51e2 -commons-text-api:1.11.0-95.v22a_d30ee5d36 -configuration-as-code:1775.v810dc950b_514 -credentials:1337.v60b_d7b_c7b_c9f -credentials-binding:657.v2b_19db_7d6e6d -data-tables-api:2.0.1-1 -display-url-api:2.200.vb_9327d658781 -docker-commons:439.va_3cb_0a_6a_fb_29 -docker-java-api:3.3.4-86.v39b_a_5ede342c -docker-plugin:1.6 -docker-workflow:572.v950f58993843 -durable-task:550.v0930093c4b_a_6 -echarts-api:5.5.0-1 +cloudbees-folder:6.942.vb_43318a_156b_2 +command-launcher:115.vd8b_301cc15d0 +commons-compress-api:1.26.1-2 +commons-lang3-api:3.16.0-82.ve2b_07d659d95 +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 +docker-workflow:580.vc0c340686b_54 +durable-task:568.v8fb_5c57e8417 +echarts-api:5.5.1-1 +eddsa-api:0.3.0-4.v84c6f0f4969e external-monitor-job:215.v2e88e894db_f8 -font-awesome-api:6.5.1-3 -git:5.2.1 -git-client:4.7.0 -git-server:114.v068a_c7cc2574 -gson-api:2.10.1-15.v0d99f670e0a_7 +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 -ionicons-api:56.v1b_1c8c49374e -jackson2-api:2.16.2-378.v7e79818f53ce +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-6 -javax-mail-api:1.6.2-9 +javax-activation-api:1.2.0-7 +javax-mail-api:1.6.2-10 jaxb:2.3.9-1 -jdk-tool:73.vddf737284550 +jdk-tool:80.v8a_dee33ed6f0 joda-time-api:2.12.7-29.v5a_b_e3a_82269a_ jquery3-api:3.7.1-2 jsch:0.2.16-86.v42e010d9484b_ json-api:20240303-41.v94e11e6de726 -json-path-api:2.9.0-33.v2527142f2e1d -junit:1259.v65ffcef24a_88 -kubernetes:4193.vded98e56cc25 +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:0.11 -ldap:711.vb_d1a_491714dc -lockable-resources:1243.v346d600eea_24 +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:822.824.v14451b_c0fd42 -metrics:4.2.21-449.v6960d7c54c69 -mina-sshd-api-common:2.12.0-90.v9f7fb_9fa_3d3b_ -mina-sshd-api-core:2.12.0-90.v9f7fb_9fa_3d3b_ +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.10 +pam-auth:1.11 pipeline-build-step:540.vb_e8849e1a_b_d8 pipeline-graph-analysis:216.vfd8b_ece330ca_ -pipeline-groovy-lib:704.vc58b_8890a_384 -pipeline-input-step:491.vb_07d21da_1a_fb_ -pipeline-milestone-step:111.v449306f708b_7 -pipeline-model-api:2.2183.vb_36481468374 -pipeline-model-definition:2.2183.vb_36481468374 -pipeline-model-extensions:2.2183.vb_36481468374 +pipeline-groovy-lib:730.ve57b_34648c63 +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-rest-api:2.34 -pipeline-stage-step:305.ve96d0205c1c6 -pipeline-stage-tags-metadata:2.2183.vb_36481468374 +pipeline-stage-step:312.v8cd10304c27a_ +pipeline-stage-tags-metadata:2.2214.vb_b_34b_2ea_9b_83 pipeline-stage-view:2.34 -pipeline-utility-steps:2.16.2 -plain-credentials:179.vc5cb_98f6db_38 +pipeline-utility-steps:2.17.0 +plain-credentials:183.va_de8f1dd5a_2b_ plugin-util-api:4.1.0 popper-api:1.16.1-3 -prism-api:1.29.0-13 -prometheus:2.5.1 -scm-api:683.vb_16722fb_b_80b_ -scm-manager:1.9.2 -script-security:1326.vdb_c154de8669 -snakeyaml-api:2.2-111.vc6598e30cc65 -ssh-credentials:322.v124df57ed808 -ssh-slaves:2.948.vb_8050d697fec -sshd:3.322.v159e91f6a_550 -structs:337.v1b_04ea_4df7c8 +prism-api:1.29.0-17 +prometheus:784.vea_eca_f6592eb_ +scm-api:696.v778d637b_a_762 +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 +structs:338.v848422169819 token-macro:400.v35420b_922dcb_ -trilead-api:2.141.v284120fd0c46 +trilead-api:2.147.vb_73cc728a_32e variant:60.v7290fc0eb_b_cd -workflow-aggregator:596.v8c21c963d92d -workflow-api:1291.v51fd2a_625da_7 -workflow-basic-steps:1049.v257a_e6b_30fb_d -workflow-cps:3883.vb_3ff2a_e3eea_f +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:1331.vc8c2fed35334 -workflow-job:1400.v7fd111b_ec82f -workflow-multibranch:773.vc4fe1378f1d5 -workflow-scm-step:415.v434365564324 -workflow-step-api:657.v03b_e8115821b_ -workflow-support:865.v43e78cc44e0d \ No newline at end of file +workflow-durable-task-step:1371.vb_7cec8f3b_95e +workflow-job:1436.vfa_244484591f +workflow-multibranch:795.ve0cb_1f45ca_9a_ +workflow-scm-step:427.v4ca_6512e7df1 +workflow-step-api:678.v3ee58b_469476 +workflow-support:920.v59f71ce16f04 \ No newline at end of file diff --git a/src/main/groovy/com/cloudogu/gitops/config/ApplicationConfigurator.groovy b/src/main/groovy/com/cloudogu/gitops/config/ApplicationConfigurator.groovy index a59ee402..29c0ae25 100644 --- a/src/main/groovy/com/cloudogu/gitops/config/ApplicationConfigurator.groovy +++ b/src/main/groovy/com/cloudogu/gitops/config/ApplicationConfigurator.groovy @@ -73,10 +73,9 @@ class ApplicationConfigurator { //repoURL: 'https://charts.jenkins.io', /* When Upgrading helm chart, also upgrade controller.tag in jenkins/values.yaml In addition: - - Upgrade bash image in values.yaml and gid-grepper - Also upgrade plugins. See docs/developers.md */ - version: '5.0.17' + version: '5.5.11' ], mavenCentralMirror: '', ],