From ceb971e6f9cb08d2fae577af3612ad2545c9a321 Mon Sep 17 00:00:00 2001 From: brokenpip3 Date: Wed, 21 Feb 2024 00:25:31 +0100 Subject: [PATCH] chore: update jenkins lts version --- chart/jenkins-operator/README.md | 10 +++++----- chart/jenkins-operator/values.yaml | 2 +- config.base.env | 2 +- pkg/constants/constants.go | 2 +- test/e2e/test_utility.go | 2 +- test/helm/helm_test.go | 2 +- variables.mk | 5 +++++ 7 files changed, 15 insertions(+), 10 deletions(-) diff --git a/chart/jenkins-operator/README.md b/chart/jenkins-operator/README.md index c2df40a5..db47748c 100644 --- a/chart/jenkins-operator/README.md +++ b/chart/jenkins-operator/README.md @@ -1,6 +1,6 @@ # jenkins-operator -![Version: 0.8.0-beta.2](https://img.shields.io/badge/Version-0.8.0--beta.2-informational?style=flat-square) ![AppVersion: 0.8.0-beta.2](https://img.shields.io/badge/AppVersion-0.8.0--beta.2-informational?style=flat-square) +![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) ![AppVersion: 0.8.0](https://img.shields.io/badge/AppVersion-0.8.0-informational?style=flat-square) Kubernetes native operator which fully manages Jenkins on Kubernetes @@ -44,15 +44,15 @@ Kubernetes native operator which fully manages Jenkins on Kubernetes | jenkins.backup.volumeMounts[1].mountPath | string | `"/backup"` | | | jenkins.backup.volumeMounts[1].name | string | `"backup"` | | | jenkins.basePlugins | list | `[]` | | -| jenkins.configuration.configurationAsCode | object | `{}` | | -| jenkins.configuration.groovyScripts | object | `{}` | | +| jenkins.configuration.configurationAsCode | list | `[]` | | +| jenkins.configuration.groovyScripts | list | `[]` | | | jenkins.configuration.secretData | object | `{}` | | | jenkins.configuration.secretRefName | string | `""` | | | jenkins.disableCSRFProtection | bool | `false` | | | jenkins.enabled | bool | `true` | | | jenkins.env | list | `[]` | | | jenkins.hostAliases | object | `{}` | | -| jenkins.image | string | `"jenkins/jenkins:2.414.1-lts"` | | +| jenkins.image | string | `"jenkins/jenkins:2.426.3-lts"` | | | jenkins.imagePullPolicy | string | `"Always"` | | | jenkins.imagePullSecrets | list | `[]` | | | jenkins.labels | object | `{}` | | @@ -109,4 +109,4 @@ Kubernetes native operator which fully manages Jenkins on Kubernetes | webhook.enabled | bool | `false` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) +Autogenerated from chart metadata using [helm-docs v1.11.2](https://github.com/norwoodj/helm-docs/releases/v1.11.2) diff --git a/chart/jenkins-operator/values.yaml b/chart/jenkins-operator/values.yaml index c39e32eb..1f085d6f 100644 --- a/chart/jenkins-operator/values.yaml +++ b/chart/jenkins-operator/values.yaml @@ -36,7 +36,7 @@ jenkins: # image is the name (and tag) of the Jenkins instance # Default: jenkins/jenkins:lts # It's recommended to use LTS (tag: "lts") version - image: jenkins/jenkins:2.414.1-lts + image: jenkins/jenkins:2.426.3-lts # env contains jenkins container environment variables env: [] diff --git a/config.base.env b/config.base.env index 5c4dd755..a24e3841 100644 --- a/config.base.env +++ b/config.base.env @@ -12,5 +12,5 @@ GEN_CRD_API="gen-crd-api-reference-docs" IMAGE_PULL_MODE="local" HELM_VERSION="3.12.3" CLUSTER_DOMAIN="cluster.local" -LATEST_LTS_VERSION="2.414.1" +LATEST_LTS_VERSION="2.426.3" KIND_CLUSTER_NAME="jenkins" diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go index 5ac3dc97..dd9dac90 100644 --- a/pkg/constants/constants.go +++ b/pkg/constants/constants.go @@ -8,7 +8,7 @@ const ( // SeedJobSuffix is a suffix added for all seed jobs SeedJobSuffix = "job-dsl-seed" // DefaultJenkinsMasterImage is the default Jenkins master docker image - DefaultJenkinsMasterImage = "jenkins/jenkins:2.414.1-lts" + DefaultJenkinsMasterImage = "jenkins/jenkins:2.426.3-lts" // DefaultHTTPPortInt32 is the default Jenkins HTTP port DefaultHTTPPortInt32 = int32(8080) // DefaultSlavePortInt32 is the default Jenkins port for slaves diff --git a/test/e2e/test_utility.go b/test/e2e/test_utility.go index c08417eb..06ccbcc1 100644 --- a/test/e2e/test_utility.go +++ b/test/e2e/test_utility.go @@ -21,7 +21,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/envtest" ) -const JenkinsTestImage = "jenkins/jenkins:2.414.1-lts" +const JenkinsTestImage = "jenkins/jenkins:2.426.3-lts" var ( Cfg *rest.Config diff --git a/test/helm/helm_test.go b/test/helm/helm_test.go index 14685cff..9eb54bf0 100644 --- a/test/helm/helm_test.go +++ b/test/helm/helm_test.go @@ -47,7 +47,7 @@ var _ = Describe("Jenkins Controller", func() { cmd := exec.Command("../../bin/helm", "upgrade", "jenkins", "../../chart/jenkins-operator", "--namespace", namespace.Name, "--debug", "--set-string", fmt.Sprintf("jenkins.namespace=%s", namespace.Name), - "--set-string", fmt.Sprintf("jenkins.image=%s", "jenkins/jenkins:2.414.1-lts"), + "--set-string", fmt.Sprintf("jenkins.image=%s", "jenkins/jenkins:2.426.3-lts"), "--set-string", fmt.Sprintf("operator.image=%s", *imageName), "--install") output, err := cmd.CombinedOutput() Expect(err).NotTo(HaveOccurred(), string(output)) diff --git a/variables.mk b/variables.mk index 9e499b3c..2adeb2cf 100644 --- a/variables.mk +++ b/variables.mk @@ -14,7 +14,12 @@ else endif endif +define strip_quotes +$(shell echo $(1) | sed -e 's/^"//' -e 's/"$$//') +endef + include config.base.env +$(foreach var,$(shell cat config.base.env),$(eval $(call strip_quotes,$(var)))) # Import config # You can change the default config with `make config="config_special.env" build`