Merge branch 'main' into init-checksum

jenkinsci · Oct 19, 2023 · 4c6f323 · 4c6f323
2 parents 3011d57 + b972ab8
commit 4c6f323
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/charts/jenkins/CHANGELOG.md b/charts/jenkins/CHANGELOG.md
@@ -12,10 +12,14 @@ 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.
 
-## 4.7.3
+## 4.7.4
 
 Add the config-init-script checksum into the controller statefullset pod annotations to trigger restart of the pod in case of updated init scripts.
 
+## 4.7.3
+
+Update Jenkins image and appVersion to jenkins lts release version 2.414.3
+
 ## 4.7.1
 
 Changes in 4.7.0 were reverted.

diff --git a/charts/jenkins/Chart.yaml b/charts/jenkins/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
 name: jenkins
 home: https://jenkins.io/
-version: 4.7.3
-appVersion: 2.414.2
+version: 4.7.4
+appVersion: 2.414.3
 description: Jenkins - Build great things at any scale! The leading open source automation server, Jenkins provides over 1800 plugins to support building, deploying and automating any project.
 sources:
   - https://github.com/jenkinsci/jenkins
@@ -35,7 +35,7 @@ annotations:
       url: https://github.com/jenkinsci/helm-charts/issues
   artifacthub.io/images: |
     - name: jenkins
-      image: jenkins/jenkins:2.414.2-jdk11
+      image: jenkins/jenkins:2.414.3-jdk11
     - name: k8s-sidecar
       image: kiwigrid/k8s-sidecar:1.24.4
     - name: inbound-agent

diff --git a/charts/jenkins/unittests/jenkins-controller-statefulset-test.yaml b/charts/jenkins/unittests/jenkins-controller-statefulset-test.yaml
@@ -72,7 +72,7 @@ tests:
                         value: "50000"
                       - name: CASC_JENKINS_CONFIG
                         value: /var/jenkins_home/casc_configs
-                    image: jenkins/jenkins:2.414.2-jdk11
+                    image: jenkins/jenkins:2.414.3-jdk11
                     imagePullPolicy: Always
                     securityContext:
                       runAsUser: 1000
@@ -165,7 +165,7 @@ tests:
                   - command:
                       - sh
                       - /var/jenkins_config/apply_config.sh
-                    image: jenkins/jenkins:2.414.2-jdk11
+                    image: jenkins/jenkins:2.414.3-jdk11
                     imagePullPolicy: Always
                     securityContext:
                       runAsUser: 1000
@@ -338,12 +338,12 @@ tests:
   - it: configure image tag
     template: jenkins-controller-statefulset.yaml
     set:
-      controller.tag: 2.414.2-slim
+      controller.tag: 2.414.3-slim
       controller.imagePullPolicy: IfNotPresent
     asserts:
       - equal:
           path: spec.template.spec.containers[0].image
-          value: jenkins/jenkins:2.414.2-slim
+          value: jenkins/jenkins:2.414.3-slim
       - equal:
           path: spec.template.spec.containers[0].imagePullPolicy
           value: IfNotPresent
@@ -354,15 +354,15 @@ tests:
     asserts:
       - equal:
           path: spec.template.spec.containers[0].image
-          value: jenkins/jenkins:2.414.2-alpine
+          value: jenkins/jenkins:2.414.3-alpine
   - it: configure empty image tag label
     template: jenkins-controller-statefulset.yaml
     set:
       controller.tagLabel:
     asserts:
       - equal:
           path: spec.template.spec.containers[0].image
-          value: jenkins/jenkins:2.414.2
+          value: jenkins/jenkins:2.414.3
   - it: custom image
     template: jenkins-controller-statefulset.yaml
     set:

diff --git a/charts/jenkins/values.yaml b/charts/jenkins/values.yaml
@@ -22,7 +22,7 @@ controller:
   # Used for label app.kubernetes.io/component
   componentName: "jenkins-controller"
   image: "jenkins/jenkins"
-  # tag: "2.414.2-jdk11"
+  # tag: "2.414.3-jdk11"
   tagLabel: jdk11
   imagePullPolicy: "Always"
   imagePullSecretName: