Merge branch 'master' into update-go-1-24

2026-02-22 11:54:10 +01:00 · 2026-02-22 11:54:10 +01:00 · 97a866d4e3
parent b9e36ff6e5 ce17cbd36b
commit 97a866d4e3
16 changed files with 43 additions and 24 deletions
--- a/VERSION.txt
+++ b/VERSION.txt
@ -1 +1 @@
-v0.9.0-beta1
+v0.9.0-beta2
--- a/api/v1alpha2/jenkins_webhook.go
+++ b/api/v1alpha2/jenkins_webhook.go
@ -45,7 +45,7 @@ var (
 )

 const (
-	Hosturl                      = "https://ci.jenkins.io/job/Infra/job/plugin-site-api/job/generate-data/lastSuccessfulBuild/artifact/plugins.json.gzip"
+	Hosturl                      = "https://reports.jenkins.io/plugin-site-api/plugins.json.gzip"
 	PluginDataFileCompressedPath = "/tmp/plugins.json.gzip"
 	PluginDataFile               = "/tmp/plugins.json"
 	shortenedCheckingPeriod      = 1 * time.Hour
--- a/chart/index.yaml
+++ b/chart/index.yaml
@ -1,6 +1,25 @@
 apiVersion: v1
 entries:
  jenkins-operator:
+  - apiVersion: v2
+    appVersion: 0.9.0-beta1
+    created: "2025-12-21T14:56:58.785096582Z"
+    dependencies:
+    - condition: cert-manager.enabled
+      name: cert-manager
+      repository: https://charts.jetstack.io
+      version: 1.14.2
+    - condition: cert-manager.enabled
+      name: cert-manager-crds
+      repository: ""
+      version: 1.14.2
+    description: Kubernetes native operator which fully manages Jenkins on Kubernetes
+    digest: 1af5fde5008ce4e7166058e7d04f78f0a720af08ce3e00af55eabd71476e56f5
+    icon: https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/assets/jenkins-operator-icon.png
+    name: jenkins-operator
+    urls:
+    - https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/chart/jenkins-operator/jenkins-operator-0.9.0-beta2.tgz
+    version: 0.9.0-beta2
  - apiVersion: v2
    appVersion: 0.9.0-beta1
    created: "2025-04-06T21:25:18.36969916Z"
@ -416,4 +435,4 @@ entries:
    urls:
    - https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/chart/jenkins-operator/jenkins-operator-0.0.1.tgz
    version: 0.0.1
-generated: "2025-04-06T21:25:18.363088324Z"
+generated: "2025-12-21T14:56:58.764612857Z"
--- a/chart/jenkins-operator/Chart.yaml
+++ b/chart/jenkins-operator/Chart.yaml
@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "0.9.0-beta1"
 description: Kubernetes native operator which fully manages Jenkins on Kubernetes
 name: jenkins-operator
-version: 0.9.0-beta1
+version: 0.9.0-beta2
 icon: https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/assets/jenkins-operator-icon.png
 dependencies:
 - name: cert-manager
--- a/chart/jenkins-operator/jenkins-operator-0.9.0-beta2.tgz
+++ b/chart/jenkins-operator/jenkins-operator-0.9.0-beta2.tgz
--- 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.528.3-lts
+  image: jenkins/jenkins:2.541.1-lts

  # env contains jenkins container environment variables
  env: []
--- a/config.base.env
+++ b/config.base.env
@ -7,7 +7,7 @@ GO_VERSION="1.24"
 HELM_VERSION="3.19.0"
 IMAGE_PULL_MODE="local"
 KIND_CLUSTER_NAME="jenkins"
-LATEST_LTS_VERSION="2.528.3"
+LATEST_LTS_VERSION="2.541.1"
 NAME="kubernetes-operator"
 NAMESPACE="default"
 OPERATOR_SDK_VERSION="1.41.1"
--- a/deploy/all-in-one-v1alpha2.yaml
+++ b/deploy/all-in-one-v1alpha2.yaml
@ -247,7 +247,7 @@ spec:
      serviceAccountName: jenkins-operator
      containers:
        - name: jenkins-operator
-          image: quay.io/jenkins-kubernetes-operator/operator:v0.9.0-beta1
+          image: quay.io/jenkins-kubernetes-operator/operator:v0.9.0-beta2
          imagePullPolicy: IfNotPresent
          ports:
            - name: http
--- 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.528.3-lts"
+	DefaultJenkinsMasterImage = "jenkins/jenkins:2.541.1-lts"
 	// DefaultHTTPPortInt32 is the default Jenkins HTTP port
 	DefaultHTTPPortInt32 = int32(8080)
 	// DefaultSlavePortInt32 is the default Jenkins port for slaves
--- a/pkg/plugins/base_plugins.go
+++ b/pkg/plugins/base_plugins.go
@ -1,11 +1,11 @@
 package plugins

 const (
-	configurationAsCodePlugin           = "configuration-as-code:2006.v001a_2ca_6b_574"
-	gitPlugin                           = "git:5.8.1"
+	configurationAsCodePlugin           = "configuration-as-code:2037.v8e5349845172"
+	gitPlugin                           = "git:5.9.0"
 	jobDslPlugin                        = "job-dsl:1.93"
-	kubernetesPlugin                    = "kubernetes:4398.vb_b_33d9e7fe23"
-	kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.299.v610fa_e76761a_"
+	kubernetesPlugin                    = "kubernetes:4423.vb_59f230b_ce53"
+	kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.303.vdfcf47fb_b_fef"
 	// Depends on workflow-job which should be automatically downloaded
 	// Hardcoding the workflow-job version leads to frequent breakage
 	workflowAggregatorPlugin = "workflow-aggregator:608.v67378e9d3db_1"
--- a/test/bats/1-deploy.bats
+++ b/test/bats/1-deploy.bats
@ -33,7 +33,7 @@ diag() {
    --set namespace=${DETIK_CLIENT_NAMESPACE} \
    --set operator.image=${OPERATOR_IMAGE} \
    --set jenkins.latestPlugins=true \
-    --set jenkins.image="jenkins/jenkins:2.528.3-lts" \
+    --set jenkins.image="jenkins/jenkins:2.541.1-lts" \
    --set jenkins.imagePullPolicy="IfNotPresent" \
    --set jenkins.backup.makeBackupBeforePodDeletion=false \
    --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \
@ -158,7 +158,7 @@ diag() {
    --set namespace=${DETIK_CLIENT_NAMESPACE} \
    --set operator.image=${OPERATOR_IMAGE} \
    --set jenkins.latestPlugins=true \
-    --set jenkins.image="jenkins/jenkins:2.528.3-lts" \
+    --set jenkins.image="jenkins/jenkins:2.541.1-lts" \
    --set jenkins.imagePullPolicy="IfNotPresent" \
    --set jenkins.backup.makeBackupBeforePodDeletion=false \
    --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \
--- a/test/bats/2-deploy-with-more-options.bats
+++ b/test/bats/2-deploy-with-more-options.bats
@ -29,7 +29,7 @@ setup() {
    --set operator.image=${OPERATOR_IMAGE} \
    --set jenkins.latestPlugins=true \
    --set jenkins.nodeSelector.batstest=yep \
-    --set jenkins.image="jenkins/jenkins:2.528.3-lts" \
+    --set jenkins.image="jenkins/jenkins:2.541.1-lts" \
    --set jenkins.imagePullPolicy="IfNotPresent" \
    --set jenkins.backup.makeBackupBeforePodDeletion=false \
    --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \
@ -107,7 +107,7 @@ setup() {
    --set operator.image=${OPERATOR_IMAGE} \
    --set jenkins.latestPlugins=true \
    --set jenkins.nodeSelector.batstest=yep \
-    --set jenkins.image="jenkins/jenkins:2.528.3-lts" \
+    --set jenkins.image="jenkins/jenkins:2.541.1-lts" \
    --set jenkins.imagePullPolicy="IfNotPresent" \
    --set jenkins.lifecycle.preStop.exec.command="{echo bats-test}" \
    --set jenkins.backup.makeBackupBeforePodDeletion=false \
--- a/test/bats/3-deploy-with-webhook.bats
+++ b/test/bats/3-deploy-with-webhook.bats
@ -29,7 +29,7 @@ setup() {
    --set namespace=${DETIK_CLIENT_NAMESPACE} \
    --set operator.image=${OPERATOR_IMAGE} \
    --set jenkins.latestPlugins=true \
-    --set jenkins.image="jenkins/jenkins:2.528.3-lts" \
+    --set jenkins.image="jenkins/jenkins:2.541.1-lts" \
    --set jenkins.imagePullPolicy="IfNotPresent" \
    --set jenkins.backup.makeBackupBeforePodDeletion=true \
    --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \
@ -90,7 +90,7 @@ setup() {
    --set namespace=${DETIK_CLIENT_NAMESPACE} \
    --set operator.image=${OPERATOR_IMAGE} \
    --set jenkins.latestPlugins=true \
-    --set jenkins.image="jenkins/jenkins:2.528.3-lts" \
+    --set jenkins.image="jenkins/jenkins:2.541.1-lts" \
    --set jenkins.imagePullPolicy="IfNotPresent" \
    --set jenkins.backup.makeBackupBeforePodDeletion=true \
    --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \
--- a/test/e2e/configuration_test.go
+++ b/test/e2e/configuration_test.go
@ -26,11 +26,11 @@ const e2e = "e2e"
 // Plugin versions should be the same as in
 // github.com/jenkinsci/kubernetes-operator/pkg/plugins/base_plugins.go
 const (
-	configurationAsCodePlugin           = "configuration-as-code:2006.v001a_2ca_6b_574"
-	gitPlugin                           = "git:5.8.1"
+	configurationAsCodePlugin           = "configuration-as-code:2037.v8e5349845172"
+	gitPlugin                           = "git:5.9.0"
 	jobDslPlugin                        = "job-dsl:1.93"
-	kubernetesPlugin                    = "kubernetes:4398.vb_b_33d9e7fe23"
-	kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.299.v610fa_e76761a_"
+	kubernetesPlugin                    = "kubernetes:4423.vb_59f230b_ce53"
+	kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.303.vdfcf47fb_b_fef"
 	// Depends on workflow-job which should be automatically downloaded
 	// Hardcoding the workflow-job version leads to frequent breakage
 	workflowAggregatorPlugin = "workflow-aggregator:608.v67378e9d3db_1"
--- 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.528.3-lts"
+const JenkinsTestImage = "jenkins/jenkins:2.541.1-lts"

 var (
 	Cfg       *rest.Config
--- 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.528.3-lts"),
+				"--set-string", fmt.Sprintf("jenkins.image=%s", "jenkins/jenkins:2.541.1-lts"),
 				"--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("jenkins.imagePullPolicy=%s", "IfNotPresent"), "--install")