Merge branch 'main' of github.com:papi83dm/helm-charts into main

Conflicts: charts/jenkins/CHANGELOG.md charts/jenkins/Chart.yaml Signed-off-by: papi83dm <[email protected]>
jenkinsci · Dec 8, 2022 · 8ee282a · 8ee282a
2 parents b82699e + 2bbd9f0
commit 8ee282a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/charts/jenkins/CHANGELOG.md b/charts/jenkins/CHANGELOG.md
@@ -12,16 +12,18 @@ Use the following links to reference issues, PRs, and commits prior to v2.6.0.
 The change log 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.2.17
+
+## 4.2.18
 
 Added quotes to the Agent command to prevent defaulting to the sleep command when the command variable was null.
 Updated the unittest to reflect this change.
 
+## 4.2.17
+Update Jenkins image and appVersion to jenkins lts release version 2.375.1
+
+
 ## 4.2.16
-
-Added quotes to the Agent command to prevent defaulting to the sleep command when the command variable was null.
-Updated the unittest to reflect this change.
-=======
+
 Fixed chart notes not rendering Jenkins URL with prefix when `controller.jenkinsUriPrefix` is set.
 Fixed chart notes not rendering Jenkins URL with `https` when `controller.ingress.tls` or `controller.controller.httpsKeyStore.enable` is set.
 Fixed chart notes rendering wrong JCasC URL when not using `controller.ingress`.

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.2.17
-appVersion: 2.361.4
+version: 4.2.18
+appVersion: 2.375.1
 description: Jenkins - Build great things at any scale! The leading open source automation server, Jenkins provides hundreds of plugins to support building, deploying and automating any project.
 sources:
   - https://github.com/jenkinsci/jenkins
@@ -29,7 +29,7 @@ annotations:
       url: https://www.jenkins.io/
   artifacthub.io/images: |
     - name: jenkins
-      image: jenkins/jenkins:2.361.4-jdk11
+      image: jenkins/jenkins:2.375.1-jdk11
     - name: k8s-sidecar
       image: kiwigrid/k8s-sidecar:1.15.0
     - name: inbound-agent

diff --git a/charts/jenkins/unittests/jenkins-controller-statefulset-test.yaml b/charts/jenkins/unittests/jenkins-controller-statefulset-test.yaml
@@ -71,7 +71,7 @@ tests:
                         value: "50000"
                       - name: CASC_JENKINS_CONFIG
                         value: /var/jenkins_home/casc_configs
-                    image: jenkins/jenkins:2.361.4-jdk11
+                    image: jenkins/jenkins:2.375.1-jdk11
                     imagePullPolicy: Always
                     securityContext:
                       runAsUser: 1000
@@ -164,7 +164,7 @@ tests:
                   - command:
                       - sh
                       - /var/jenkins_config/apply_config.sh
-                    image: jenkins/jenkins:2.361.4-jdk11
+                    image: jenkins/jenkins:2.375.1-jdk11
                     imagePullPolicy: Always
                     securityContext:
                       runAsUser: 1000
@@ -353,15 +353,15 @@ tests:
     asserts:
       - equal:
           path: spec.template.spec.containers[0].image
-          value: jenkins/jenkins:2.361.4-alpine
+          value: jenkins/jenkins:2.375.1-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.361.4
+          value: jenkins/jenkins:2.375.1
   - it: custom image
     template: jenkins-controller-statefulset.yaml
     set:

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