From f15df6790eacd68978d1c2936062c2f20fb78928 Mon Sep 17 00:00:00 2001 From: pauloferreira25 Date: Tue, 26 Sep 2023 13:05:09 -0300 Subject: [PATCH 1/4] upgrade 2.425 --- charts/jenkins/Chart.yaml | 6 +++--- .../jenkins-controller-statefulset-test.yaml | 12 ++++++------ charts/jenkins/values.yaml | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/charts/jenkins/Chart.yaml b/charts/jenkins/Chart.yaml index 38a77db2d..589832c76 100644 --- a/charts/jenkins/Chart.yaml +++ b/charts/jenkins/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 name: jenkins home: https://jenkins.io/ -version: 4.6.4 -appVersion: 2.414.1 +version: 4.6.5 +appVersion: 2.425 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.1-jdk11 + image: jenkins/jenkins:2.425-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 index 6a04ae369..cc9552810 100644 --- 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.414.1-jdk11 + image: jenkins/jenkins:2.425-jdk11 imagePullPolicy: Always securityContext: runAsUser: 1000 @@ -164,7 +164,7 @@ tests: - command: - sh - /var/jenkins_config/apply_config.sh - image: jenkins/jenkins:2.414.1-jdk11 + image: jenkins/jenkins:2.425-jdk11 imagePullPolicy: Always securityContext: runAsUser: 1000 @@ -337,12 +337,12 @@ tests: - it: configure image tag template: jenkins-controller-statefulset.yaml set: - controller.tag: 2.414.1-slim + controller.tag: 2.425-slim controller.imagePullPolicy: IfNotPresent asserts: - equal: path: spec.template.spec.containers[0].image - value: jenkins/jenkins:2.414.1-slim + value: jenkins/jenkins:2.425-slim - equal: path: spec.template.spec.containers[0].imagePullPolicy value: IfNotPresent @@ -353,7 +353,7 @@ tests: asserts: - equal: path: spec.template.spec.containers[0].image - value: jenkins/jenkins:2.414.1-alpine + value: jenkins/jenkins:2.425-alpine - it: configure empty image tag label template: jenkins-controller-statefulset.yaml set: @@ -361,7 +361,7 @@ tests: asserts: - equal: path: spec.template.spec.containers[0].image - value: jenkins/jenkins:2.414.1 + value: jenkins/jenkins:2.425 - it: custom image template: jenkins-controller-statefulset.yaml set: diff --git a/charts/jenkins/values.yaml b/charts/jenkins/values.yaml index 5828710af..4ebd8d4e9 100644 --- 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.1-jdk11" + # tag: "2.425-jdk11" tagLabel: jdk11 imagePullPolicy: "Always" imagePullSecretName: From d52d1ba4aa3be97d80389722a95e5c735585857f Mon Sep 17 00:00:00 2001 From: pauloferreira25 Date: Tue, 26 Sep 2023 13:06:38 -0300 Subject: [PATCH 2/4] upgrade changelog --- charts/jenkins/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/charts/jenkins/CHANGELOG.md b/charts/jenkins/CHANGELOG.md index d7f465dc4..f91f8273f 100644 --- a/charts/jenkins/CHANGELOG.md +++ b/charts/jenkins/CHANGELOG.md @@ -12,6 +12,10 @@ 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.6.5 + +Update Jenkins image and appVersion to jenkins lts release version 2.425 + ## 4.6.4 Introducing TPL function on variables related to hostname in `./charts/jenkins/templates/jenkins-controller-ingress.yaml` From 04bf0c426d5d47fdbff25fb0c057edc2509916dc Mon Sep 17 00:00:00 2001 From: pauloferreira25 Date: Tue, 26 Sep 2023 13:12:29 -0300 Subject: [PATCH 3/4] appVersion should be of type string --- charts/jenkins/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/jenkins/Chart.yaml b/charts/jenkins/Chart.yaml index 589832c76..0f963a115 100644 --- a/charts/jenkins/Chart.yaml +++ b/charts/jenkins/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: jenkins home: https://jenkins.io/ version: 4.6.5 -appVersion: 2.425 +appVersion: "2.425" 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 From 6a96beb17875fc22cec6a76cf02c34e3ebe77b66 Mon Sep 17 00:00:00 2001 From: pauloferreira25 Date: Tue, 26 Sep 2023 13:28:23 -0300 Subject: [PATCH 4/4] change to LTS version --- charts/jenkins/CHANGELOG.md | 2 +- charts/jenkins/Chart.yaml | 4 ++-- .../jenkins-controller-statefulset-test.yaml | 12 ++++++------ charts/jenkins/values.yaml | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/charts/jenkins/CHANGELOG.md b/charts/jenkins/CHANGELOG.md index f91f8273f..13f9be3c3 100644 --- a/charts/jenkins/CHANGELOG.md +++ b/charts/jenkins/CHANGELOG.md @@ -14,7 +14,7 @@ Those entries include a reference to the git commit to be able to get more detai ## 4.6.5 -Update Jenkins image and appVersion to jenkins lts release version 2.425 +Update Jenkins image and appVersion to jenkins lts release version 2.414.2 ## 4.6.4 diff --git a/charts/jenkins/Chart.yaml b/charts/jenkins/Chart.yaml index 0f963a115..26d0449a8 100644 --- a/charts/jenkins/Chart.yaml +++ b/charts/jenkins/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: jenkins home: https://jenkins.io/ version: 4.6.5 -appVersion: "2.425" +appVersion: "2.414.2" 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.425-jdk11 + image: jenkins/jenkins:2.414.2-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 index cc9552810..896643d5b 100644 --- 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.425-jdk11 + image: jenkins/jenkins:2.414.2-jdk11 imagePullPolicy: Always securityContext: runAsUser: 1000 @@ -164,7 +164,7 @@ tests: - command: - sh - /var/jenkins_config/apply_config.sh - image: jenkins/jenkins:2.425-jdk11 + image: jenkins/jenkins:2.414.2-jdk11 imagePullPolicy: Always securityContext: runAsUser: 1000 @@ -337,12 +337,12 @@ tests: - it: configure image tag template: jenkins-controller-statefulset.yaml set: - controller.tag: 2.425-slim + controller.tag: 2.414.2-slim controller.imagePullPolicy: IfNotPresent asserts: - equal: path: spec.template.spec.containers[0].image - value: jenkins/jenkins:2.425-slim + value: jenkins/jenkins:2.414.2-slim - equal: path: spec.template.spec.containers[0].imagePullPolicy value: IfNotPresent @@ -353,7 +353,7 @@ tests: asserts: - equal: path: spec.template.spec.containers[0].image - value: jenkins/jenkins:2.425-alpine + value: jenkins/jenkins:2.414.2-alpine - it: configure empty image tag label template: jenkins-controller-statefulset.yaml set: @@ -361,7 +361,7 @@ tests: asserts: - equal: path: spec.template.spec.containers[0].image - value: jenkins/jenkins:2.425 + value: jenkins/jenkins:2.414.2 - it: custom image template: jenkins-controller-statefulset.yaml set: diff --git a/charts/jenkins/values.yaml b/charts/jenkins/values.yaml index 4ebd8d4e9..834e6a9a0 100644 --- 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.425-jdk11" + # tag: "2.414.2-jdk11" tagLabel: jdk11 imagePullPolicy: "Always" imagePullSecretName: