public_git
/
kubernetes-operator
mirror of https://github.com/jenkinsci/kubernetes-operator.git
1
0
Fork 0
Code Issues Releases Wiki Activity

chore: update jenkins lts version

This commit is contained in:
brokenpip3 2024-02-21 00:25:31 +01:00
parent 8a886fa051
commit ceb971e6f9
No known key found for this signature in database
GPG Key ID: 1D9BDC803797B4B6
7 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
chart/jenkins-operator/README.md
View File

@ -1,6 +1,6 @@
# jenkins-operator # 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 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].mountPath | string | `"/backup"` | |
| jenkins.backup.volumeMounts[1].name | string | `"backup"` | | | jenkins.backup.volumeMounts[1].name | string | `"backup"` | |
| jenkins.basePlugins | list | `[]` | | | jenkins.basePlugins | list | `[]` | |
| jenkins.configuration.configurationAsCode | object | `{}` | | | jenkins.configuration.configurationAsCode | list | `[]` | |
| jenkins.configuration.groovyScripts | object | `{}` | | | jenkins.configuration.groovyScripts | list | `[]` | |
| jenkins.configuration.secretData | object | `{}` | | | jenkins.configuration.secretData | object | `{}` | |
| jenkins.configuration.secretRefName | string | `""` | | | jenkins.configuration.secretRefName | string | `""` | |
| jenkins.disableCSRFProtection | bool | `false` | | | jenkins.disableCSRFProtection | bool | `false` | |
| jenkins.enabled | bool | `true` | | | jenkins.enabled | bool | `true` | |
| jenkins.env | list | `[]` | | | jenkins.env | list | `[]` | |
| jenkins.hostAliases | object | `{}` | | | 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.imagePullPolicy | string | `"Always"` | |
| jenkins.imagePullSecrets | list | `[]` | | | jenkins.imagePullSecrets | list | `[]` | |
| jenkins.labels | object | `{}` | | | jenkins.labels | object | `{}` | |
@ -109,4 +109,4 @@ Kubernetes native operator which fully manages Jenkins on Kubernetes
| webhook.enabled | bool | `false` | | | 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)

2
chart/jenkins-operator/values.yaml
View File

@ -36,7 +36,7 @@ jenkins:
# image is the name (and tag) of the Jenkins instance # image is the name (and tag) of the Jenkins instance
# Default: jenkins/jenkins:lts # Default: jenkins/jenkins:lts
# It's recommended to use LTS (tag: "lts") version # 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 contains jenkins container environment variables
env: [] env: []

2
config.base.env
View File

@ -12,5 +12,5 @@ GEN_CRD_API="gen-crd-api-reference-docs"
IMAGE_PULL_MODE="local" IMAGE_PULL_MODE="local"
HELM_VERSION="3.12.3" HELM_VERSION="3.12.3"
CLUSTER_DOMAIN="cluster.local" CLUSTER_DOMAIN="cluster.local"
LATEST_LTS_VERSION="2.414.1" LATEST_LTS_VERSION="2.426.3"
KIND_CLUSTER_NAME="jenkins" KIND_CLUSTER_NAME="jenkins"

2
pkg/constants/constants.go
View File

@ -8,7 +8,7 @@ const (
// SeedJobSuffix is a suffix added for all seed jobs // SeedJobSuffix is a suffix added for all seed jobs
SeedJobSuffix = "job-dsl-seed" SeedJobSuffix = "job-dsl-seed"
// DefaultJenkinsMasterImage is the default Jenkins master docker image // 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 is the default Jenkins HTTP port
DefaultHTTPPortInt32 = int32(8080) DefaultHTTPPortInt32 = int32(8080)
// DefaultSlavePortInt32 is the default Jenkins port for slaves // DefaultSlavePortInt32 is the default Jenkins port for slaves

2
test/e2e/test_utility.go
View File

@ -21,7 +21,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/envtest" "sigs.k8s.io/controller-runtime/pkg/envtest"
) )
const JenkinsTestImage = "jenkins/jenkins:2.414.1-lts" const JenkinsTestImage = "jenkins/jenkins:2.426.3-lts"
var ( var (
Cfg *rest.Config Cfg *rest.Config

2
test/helm/helm_test.go
View File

@ -47,7 +47,7 @@ var _ = Describe("Jenkins Controller", func() {
cmd := exec.Command("../../bin/helm", "upgrade", "jenkins", "../../chart/jenkins-operator", "--namespace", namespace.Name, "--debug", 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.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") "--set-string", fmt.Sprintf("operator.image=%s", *imageName), "--install")
output, err := cmd.CombinedOutput() output, err := cmd.CombinedOutput()
Expect(err).NotTo(HaveOccurred(), string(output)) Expect(err).NotTo(HaveOccurred(), string(output))

5
variables.mk
View File

@ -14,7 +14,12 @@ else
endif endif
endif endif
define strip_quotes
$(shell echo $(1) | sed -e 's/^"//' -e 's/"$$//')
endef
include config.base.env include config.base.env
$(foreach var,$(shell cat config.base.env),$(eval $(call strip_quotes,$(var))))
# Import config # Import config
# You can change the default config with `make config="config_special.env" build` # You can change the default config with `make config="config_special.env" build`