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

bump: jenkins/jenkins:2.492.2-lts and update helm chart readme

This commit is contained in:
brokenpip3 2025-03-30 19:18:31 +02:00
parent bec1c61e27
commit d9c9ec9dda
No known key found for this signature in database
GPG Key ID: 1D9BDC803797B4B6
9 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,11 +54,12 @@ Kubernetes native operator which fully manages Jenkins on Kubernetes
| 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.479.2-lts"` | | | jenkins.image | string | `"jenkins/jenkins:2.492.2-lts"` | |
| jenkins.imagePullPolicy | string | `"Always"` | | | jenkins.imagePullPolicy | string | `"Always"` | |
| jenkins.imagePullSecrets | list | `[]` | | | jenkins.imagePullSecrets | list | `[]` | |
| jenkins.labels | object | `{}` | | | jenkins.labels | object | `{}` | |
| jenkins.latestPlugins | bool | `true` | | | jenkins.latestPlugins | bool | `true` | |
| jenkins.lifecycle | object | `{}` | |
| jenkins.livenessProbe.failureThreshold | int | `20` | | | jenkins.livenessProbe.failureThreshold | int | `20` | |
| jenkins.livenessProbe.httpGet.path | string | `"/login"` | | | jenkins.livenessProbe.httpGet.path | string | `"/login"` | |
| jenkins.livenessProbe.httpGet.port | string | `"http"` | | | jenkins.livenessProbe.httpGet.port | string | `"http"` | |
@ -112,4 +113,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.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.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.479.2-lts image: jenkins/jenkins:2.492.2-lts
# env contains jenkins container environment variables # env contains jenkins container environment variables
env: [] env: []

2
config.base.env
View File

@ -7,7 +7,7 @@ GO_VERSION="1.22"
HELM_VERSION="3.12.3" HELM_VERSION="3.12.3"
IMAGE_PULL_MODE="local" IMAGE_PULL_MODE="local"
KIND_CLUSTER_NAME="jenkins" KIND_CLUSTER_NAME="jenkins"
LATEST_LTS_VERSION="2.479.2" LATEST_LTS_VERSION="2.492.2"
NAME="kubernetes-operator" NAME="kubernetes-operator"
NAMESPACE="default" NAMESPACE="default"
OPERATOR_SDK_VERSION="1.35.0" OPERATOR_SDK_VERSION="1.35.0"

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.479.2-lts" DefaultJenkinsMasterImage = "jenkins/jenkins:2.492.2-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

4
test/bats/1-deploy.bats
View File

@ -33,7 +33,7 @@ diag() {
--set namespace=${DETIK_CLIENT_NAMESPACE} \ --set namespace=${DETIK_CLIENT_NAMESPACE} \
--set operator.image=${OPERATOR_IMAGE} \ --set operator.image=${OPERATOR_IMAGE} \
--set jenkins.latestPlugins=true \ --set jenkins.latestPlugins=true \
--set jenkins.image="jenkins/jenkins:2.479.2-lts" \ --set jenkins.image="jenkins/jenkins:2.492.2-lts" \
--set jenkins.imagePullPolicy="IfNotPresent" \ --set jenkins.imagePullPolicy="IfNotPresent" \
--set jenkins.backup.makeBackupBeforePodDeletion=false \ --set jenkins.backup.makeBackupBeforePodDeletion=false \
--set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \ --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \
@ -154,7 +154,7 @@ diag() {
--set namespace=${DETIK_CLIENT_NAMESPACE} \ --set namespace=${DETIK_CLIENT_NAMESPACE} \
--set operator.image=${OPERATOR_IMAGE} \ --set operator.image=${OPERATOR_IMAGE} \
--set jenkins.latestPlugins=true \ --set jenkins.latestPlugins=true \
--set jenkins.image="jenkins/jenkins:2.479.2-lts" \ --set jenkins.image="jenkins/jenkins:2.492.2-lts" \
--set jenkins.imagePullPolicy="IfNotPresent" \ --set jenkins.imagePullPolicy="IfNotPresent" \
--set jenkins.backup.makeBackupBeforePodDeletion=false \ --set jenkins.backup.makeBackupBeforePodDeletion=false \
--set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \ --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \

4
test/bats/2-deploy-with-more-options.bats
View File

@ -29,7 +29,7 @@ setup() {
--set operator.image=${OPERATOR_IMAGE} \ --set operator.image=${OPERATOR_IMAGE} \
--set jenkins.latestPlugins=true \ --set jenkins.latestPlugins=true \
--set jenkins.nodeSelector.batstest=yep \ --set jenkins.nodeSelector.batstest=yep \
--set jenkins.image="jenkins/jenkins:2.479.2-lts" \ --set jenkins.image="jenkins/jenkins:2.492.2-lts" \
--set jenkins.imagePullPolicy="IfNotPresent" \ --set jenkins.imagePullPolicy="IfNotPresent" \
--set jenkins.backup.makeBackupBeforePodDeletion=false \ --set jenkins.backup.makeBackupBeforePodDeletion=false \
--set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \ --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \
@ -107,7 +107,7 @@ setup() {
--set operator.image=${OPERATOR_IMAGE} \ --set operator.image=${OPERATOR_IMAGE} \
--set jenkins.latestPlugins=true \ --set jenkins.latestPlugins=true \
--set jenkins.nodeSelector.batstest=yep \ --set jenkins.nodeSelector.batstest=yep \
--set jenkins.image="jenkins/jenkins:2.479.2-lts" \ --set jenkins.image="jenkins/jenkins:2.492.2-lts" \
--set jenkins.imagePullPolicy="IfNotPresent" \ --set jenkins.imagePullPolicy="IfNotPresent" \
--set jenkins.lifecycle.preStop.exec.command="{echo bats-test}" \ --set jenkins.lifecycle.preStop.exec.command="{echo bats-test}" \
--set jenkins.backup.makeBackupBeforePodDeletion=false \ --set jenkins.backup.makeBackupBeforePodDeletion=false \

4
test/bats/3-deploy-with-webhook.bats
View File

@ -29,7 +29,7 @@ setup() {
--set namespace=${DETIK_CLIENT_NAMESPACE} \ --set namespace=${DETIK_CLIENT_NAMESPACE} \
--set operator.image=${OPERATOR_IMAGE} \ --set operator.image=${OPERATOR_IMAGE} \
--set jenkins.latestPlugins=true \ --set jenkins.latestPlugins=true \
--set jenkins.image="jenkins/jenkins:2.479.2-lts" \ --set jenkins.image="jenkins/jenkins:2.492.2-lts" \
--set jenkins.imagePullPolicy="IfNotPresent" \ --set jenkins.imagePullPolicy="IfNotPresent" \
--set jenkins.backup.makeBackupBeforePodDeletion=true \ --set jenkins.backup.makeBackupBeforePodDeletion=true \
--set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \ --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \
@ -90,7 +90,7 @@ setup() {
--set namespace=${DETIK_CLIENT_NAMESPACE} \ --set namespace=${DETIK_CLIENT_NAMESPACE} \
--set operator.image=${OPERATOR_IMAGE} \ --set operator.image=${OPERATOR_IMAGE} \
--set jenkins.latestPlugins=true \ --set jenkins.latestPlugins=true \
--set jenkins.image="jenkins/jenkins:2.479.2-lts" \ --set jenkins.image="jenkins/jenkins:2.492.2-lts" \
--set jenkins.imagePullPolicy="IfNotPresent" \ --set jenkins.imagePullPolicy="IfNotPresent" \
--set jenkins.backup.makeBackupBeforePodDeletion=true \ --set jenkins.backup.makeBackupBeforePodDeletion=true \
--set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \ --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \

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.479.2-lts" const JenkinsTestImage = "jenkins/jenkins:2.492.2-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.479.2-lts"), "--set-string", fmt.Sprintf("jenkins.image=%s", "jenkins/jenkins:2.492.2-lts"),
"--set-string", fmt.Sprintf("operator.image=%s", *imageName), "--set-string", fmt.Sprintf("operator.image=%s", *imageName),
"--set-string", fmt.Sprintf("backup.image=%s", "quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test"), "--set-string", fmt.Sprintf("backup.image=%s", "quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test"),
"--set-string", fmt.Sprintf("jenkins.imagePullPolicy=%s", "IfNotPresent"), "--install") "--set-string", fmt.Sprintf("jenkins.imagePullPolicy=%s", "IfNotPresent"), "--install")