Merge branch 'main' into renovate/jenkins-x-plugins-jx-release-version-2.x

Author: krisstern

charts/jenkins/CHANGELOG.md

@@ -12,6 +12,22 @@ 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.9.18
+
+Update `docker.io/kiwigrid/k8s-sidecar` to version `2.6.0`
+
+## 5.9.17
+
+Update `jenkins/jenkins` to version `2.555.1-jdk21`
+
+## 5.9.16
+
+Update `jenkins/inbound-agent` to version `3355.v388858a_47b_33-19`
+
+## 5.9.15
+
+Update `configuration-as-code` to version `2074.va_57f83f7a_10b_`
+
 ## 5.9.14
 
 Update `jenkins/inbound-agent` to version `3355.v388858a_47b_33-18`

charts/jenkins/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: jenkins
 type: application
 home: https://www.jenkins.io/
-version: 5.9.14
-appVersion: 2.541.3
+version: 5.9.18
+appVersion: 2.555.1
 description: >
   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.
 
@@ -38,10 +38,10 @@ annotations:
       url: https://github.com/jenkinsci/helm-charts/issues
   artifacthub.io/images: |
     - name: jenkins
-      image: docker.io/jenkins/jenkins:2.541.3-jdk21
+      image: docker.io/jenkins/jenkins:2.555.1-jdk21
     - name: k8s-sidecar
-      image: docker.io/kiwigrid/k8s-sidecar:2.5.0
+      image: docker.io/kiwigrid/k8s-sidecar:2.6.0
     - name: inbound-agent
-      image: jenkins/inbound-agent:3355.v388858a_47b_33-18
+      image: jenkins/inbound-agent:3355.v388858a_47b_33-19
   artifacthub.io/category: "integration-delivery"
   artifacthub.io/license: "Apache-2.0"

charts/jenkins/VALUES.md

@@ -32,7 +32,7 @@ The following tables list the configurable parameters of the Jenkins chart and t
 | [agent.idleMinutes](./values.yaml#L1183) | int | Allows the Pod to remain active for reuse until the configured number of minutes has passed since the last step was executed on it | `0` |
 | [agent.image.registry](./values.yaml#L1011) | string | Registry to pull the agent jnlp image from | `""` |
 | [agent.image.repository](./values.yaml#L1013) | string | Repository to pull the agent jnlp image from | `"jenkins/inbound-agent"` |
-| [agent.image.tag](./values.yaml#L1015) | string | Tag of the image to pull | `"3355.v388858a_47b_33-18"` |
+| [agent.image.tag](./values.yaml#L1015) | string | Tag of the image to pull | `"3355.v388858a_47b_33-19"` |
 | [agent.imagePullSecretName](./values.yaml#L1022) | string | Name of the secret to be used to pull the image | `nil` |
 | [agent.inheritYamlMergeStrategy](./values.yaml#L1202) | bool | Controls whether the defined yaml merge strategy will be inherited if another defined pod template is configured to inherit from the current one | `false` |
 | [agent.instanceCap](./values.yaml#L1166) | int | Max number of agents to launch for this type of agent | `2147483647` |
@@ -179,7 +179,7 @@ The following tables list the configurable parameters of the Jenkins chart and t
 | [controller.initializeOnce](./values.yaml#L439) | bool | Initialize only on first installation. Ensures plugins do not get updated inadvertently. Requires `persistence.enabled` to be set to `true` | `false` |
 | [controller.installLatestPlugins](./values.yaml#L428) | bool | Download the minimum required version or latest version of all dependencies | `true` |
 | [controller.installLatestSpecifiedPlugins](./values.yaml#L431) | bool | Set to true to download the latest version of any plugin that is requested to have the latest version | `false` |
-| [controller.installPlugins](./values.yaml#L420) | list | List of Jenkins plugins to install. If you don't want to install plugins, set it to `false` | `["kubernetes:4423.vb_59f230b_ce53","workflow-aggregator:608.v67378e9d3db_1","git:5.10.1","configuration-as-code:2061.vc08919f7fc37"]` |
+| [controller.installPlugins](./values.yaml#L420) | list | List of Jenkins plugins to install. If you don't want to install plugins, set it to `false` | `["kubernetes:4423.vb_59f230b_ce53","workflow-aggregator:608.v67378e9d3db_1","git:5.10.1","configuration-as-code:2074.va_57f83f7a_10b_"]` |
 | [controller.javaOpts](./values.yaml#L171) | string | Append to `JAVA_OPTS` env var | `nil` |
 | [controller.jenkinsAdminEmail](./values.yaml#L105) | string | Email address for the administrator of the Jenkins instance | `nil` |
 | [controller.jenkinsHome](./values.yaml#L110) | string | Custom Jenkins home path | `"/var/jenkins_home"` |
@@ -274,7 +274,7 @@ The following tables list the configurable parameters of the Jenkins chart and t
 | [controller.sidecars.configAutoReload.healthPort](./values.yaml#L589) | int | Port for sidecar health probes | `8060` |
 | [controller.sidecars.configAutoReload.image.registry](./values.yaml#L582) | string | Registry for the image that triggers the reload | `"docker.io"` |
 | [controller.sidecars.configAutoReload.image.repository](./values.yaml#L584) | string | Repository of the image that triggers the reload | `"kiwigrid/k8s-sidecar"` |
-| [controller.sidecars.configAutoReload.image.tag](./values.yaml#L586) | string | Tag for the image that triggers the reload | `"2.5.0"` |
+| [controller.sidecars.configAutoReload.image.tag](./values.yaml#L586) | string | Tag for the image that triggers the reload | `"2.6.0"` |
 | [controller.sidecars.configAutoReload.imagePullPolicy](./values.yaml#L587) | string |  | `"IfNotPresent"` |
 | [controller.sidecars.configAutoReload.logging](./values.yaml#L606) | object | Config auto-reload logging settings | `{"configuration":{"backupCount":3,"formatter":"JSON","logLevel":"INFO","logToConsole":true,"logToFile":false,"maxBytes":1024,"override":false}}` |
 | [controller.sidecars.configAutoReload.logging.configuration.override](./values.yaml#L610) | bool | Enables custom log config utilizing using the settings below. | `false` |

charts/jenkins/unittests/__snapshot__/config-test.yaml.snap

@@ -4,12 +4,12 @@ additional plugins config:
       kubernetes:4423.vb_59f230b_ce53
       workflow-aggregator:608.v67378e9d3db_1
       git:5.10.1
-      configuration-as-code:2061.vc08919f7fc37
+      configuration-as-code:2074.va_57f83f7a_10b_
       kubernetes-credentials-provider
 default config without helm labels:
   1: |
     |-
       kubernetes:4423.vb_59f230b_ce53
       workflow-aggregator:608.v67378e9d3db_1
       git:5.10.1
-      configuration-as-code:2061.vc08919f7fc37
+      configuration-as-code:2074.va_57f83f7a_10b_

charts/jenkins/unittests/__snapshot__/garbage-collect-test.yaml.snap

@@ -49,7 +49,7 @@ namespaces:
             templates:
               - name: "default"
                 namespace: "my-namespace"
-                id: 4957e4cea438a9211b4e3441f9406f0923c63bdbb99e593789f811ccf5ace195
+                id: d849c2961601298719c70916aded40a381409eabd68e6980fc5d17bd155df793
                 containers:
                 - name: "jnlp"
                   alwaysPullImage: false
@@ -58,7 +58,7 @@ namespaces:
                     - envVar:
                         key: "JENKINS_URL"
                         value: "http://my-release-jenkins.my-namespace.svc.cluster.local:8080/"
-                  image: "jenkins/inbound-agent:3355.v388858a_47b_33-18"
+                  image: "jenkins/inbound-agent:3355.v388858a_47b_33-19"
                   privileged: "false"
                   resourceLimitCpu: 512m
                   resourceLimitMemory: 512Mi
@@ -77,9 +77,6 @@ namespaces:
                 yamlMergeStrategy: override
                 inheritYamlMergeStrategy: false
         slaveAgentPort: 50000
-        crumbIssuer:
-          standard:
-            excludeClientIPFromCrumb: true
       security:
         apiToken:
           creationOfLegacyTokenEnabled: false
@@ -136,7 +133,7 @@ one cloud:
             templates:
               - name: "default"
                 namespace: "my-namespace"
-                id: 3800a28592eedbf0646138e67cda85eea2419727bb5fa2aa0ec6463d09a42ca7
+                id: e7229dd9ce72e48637df6909766860b99aeb9a1bdf84ed124e08371b5cc88bc6
                 containers:
                 - name: "jnlp"
                   alwaysPullImage: false
@@ -145,7 +142,7 @@ one cloud:
                     - envVar:
                         key: "JENKINS_URL"
                         value: "http://my-release-jenkins.my-namespace.svc.cluster.local:8080/"
-                  image: "jenkins/inbound-agent:3355.v388858a_47b_33-18"
+                  image: "jenkins/inbound-agent:3355.v388858a_47b_33-19"
                   privileged: "false"
                   resourceLimitCpu: 512m
                   resourceLimitMemory: 512Mi
@@ -164,9 +161,6 @@ one cloud:
                 yamlMergeStrategy: override
                 inheritYamlMergeStrategy: false
         slaveAgentPort: 50000
-        crumbIssuer:
-          standard:
-            excludeClientIPFromCrumb: true
       security:
         apiToken:
           creationOfLegacyTokenEnabled: false
@@ -223,7 +217,7 @@ second cloud:
             templates:
               - name: "default"
                 namespace: "my-namespace"
-                id: 3800a28592eedbf0646138e67cda85eea2419727bb5fa2aa0ec6463d09a42ca7
+                id: e7229dd9ce72e48637df6909766860b99aeb9a1bdf84ed124e08371b5cc88bc6
                 containers:
                 - name: "jnlp"
                   alwaysPullImage: false
@@ -232,7 +226,7 @@ second cloud:
                     - envVar:
                         key: "JENKINS_URL"
                         value: "http://my-release-jenkins.my-namespace.svc.cluster.local:8080/"
-                  image: "jenkins/inbound-agent:3355.v388858a_47b_33-18"
+                  image: "jenkins/inbound-agent:3355.v388858a_47b_33-19"
                   privileged: "false"
                   resourceLimitCpu: 512m
                   resourceLimitMemory: 512Mi
@@ -275,7 +269,7 @@ second cloud:
             templates:
               - name: "default"
                 namespace: "my-namespace"
-                id: 0e5d9ea34c2f374e1fa9b99943033f111c23033f32b0b4b4aaa99f15d4bcd86b
+                id: 5a9432aa4b20aa8a9ff6520407c8e8594574c9883285f41064a10b8384f0821f
                 containers:
                 - name: "jnlp"
                   alwaysPullImage: false
@@ -284,7 +278,7 @@ second cloud:
                     - envVar:
                         key: "JENKINS_URL"
                         value: "http://my-release-jenkins.my-namespace.svc.cluster.local:8080/"
-                  image: "jenkins/inbound-agent:3355.v388858a_47b_33-18"
+                  image: "jenkins/inbound-agent:3355.v388858a_47b_33-19"
                   privileged: "false"
                   resourceLimitCpu: 512m
                   resourceLimitMemory: 512Mi
@@ -303,9 +297,6 @@ second cloud:
                 yamlMergeStrategy: override
                 inheritYamlMergeStrategy: false
         slaveAgentPort: 50000
-        crumbIssuer:
-          standard:
-            excludeClientIPFromCrumb: true
       security:
         apiToken:
           creationOfLegacyTokenEnabled: false

charts/jenkins/unittests/__snapshot__/instance-cap-test.yaml.snap

@@ -44,7 +44,7 @@ default-cap:
             templates:
               - name: "default"
                 namespace: "my-namespace"
-                id: 28db075af0957a256fc45064e6acab29eca522c5fc8ff0b34758e6a8e837f782
+                id: bad56ce76c3a0312a1969d7702f884e938a2ac146244a2fdb558e233960e33e2
                 containers:
                 - name: "jnlp"
                   alwaysPullImage: false
@@ -53,7 +53,7 @@ default-cap:
                     - envVar:
                         key: "JENKINS_URL"
                         value: "http://my-release-jenkins.my-namespace.svc.cluster.local:8080/"
-                  image: "jenkins/inbound-agent:3355.v388858a_47b_33-18"
+                  image: "jenkins/inbound-agent:3355.v388858a_47b_33-19"
                   privileged: "false"
                   resourceLimitCpu: 512m
                   resourceLimitMemory: 512Mi
@@ -72,9 +72,6 @@ default-cap:
                 yamlMergeStrategy: override
                 inheritYamlMergeStrategy: false
         slaveAgentPort: 50000
-        crumbIssuer:
-          standard:
-            excludeClientIPFromCrumb: true
       security:
         apiToken:
           creationOfLegacyTokenEnabled: false
@@ -129,7 +126,7 @@ limited-cap:
             templates:
               - name: "default"
                 namespace: "my-namespace"
-                id: c5832014be0b7e82aceb9595d606a16fab59583b32ccab7601001667cff46846
+                id: bac725a2dea235c68625370a7ce30daf2b3d8dcccda97d9672069b79f367f914
                 containers:
                 - name: "jnlp"
                   alwaysPullImage: false
@@ -138,7 +135,7 @@ limited-cap:
                     - envVar:
                         key: "JENKINS_URL"
                         value: "http://my-release-jenkins.my-namespace.svc.cluster.local:8080/"
-                  image: "jenkins/inbound-agent:3355.v388858a_47b_33-18"
+                  image: "jenkins/inbound-agent:3355.v388858a_47b_33-19"
                   privileged: "false"
                   resourceLimitCpu: 512m
                   resourceLimitMemory: 512Mi
@@ -157,9 +154,6 @@ limited-cap:
                 yamlMergeStrategy: override
                 inheritYamlMergeStrategy: false
         slaveAgentPort: 50000
-        crumbIssuer:
-          standard:
-            excludeClientIPFromCrumb: true
       security:
         apiToken:
           creationOfLegacyTokenEnabled: false