diff --git a/api/v1alpha2/jenkins_types.go b/api/v1alpha2/jenkins_types.go index b806902e..3e380c99 100644 --- a/api/v1alpha2/jenkins_types.go +++ b/api/v1alpha2/jenkins_types.go @@ -351,19 +351,19 @@ type JenkinsMaster struct { // +optional // Defaults to : // - name: configuration-as-code - // version: "1346.ve8cfa_3473c94" + // version: "1625.v27444588cc3d" // - name: git - // version: "4.11.3" + // version: "5.0.0" // - name: job-dsl - // version: "1.78.1" + // version: "1.83" // - name: kubernetes - // version: "1.31.3" + // version: "3909.v1f2c633e8590" // - name: kubernetes-credentials-provider - // version: "0.20" + // version: "1.211.vc236a_f5a_2f3c" // - name: workflow-aggregator - // version: "2.6" + // version: "596.v8c21c963d92d" // - name: workflow-job - // version: "1145.v7f2433caa07f" + // version: "1289.vd1c337fd5354" BasePlugins []Plugin `json:"basePlugins,omitempty"` // Plugins contains plugins required by user diff --git a/chart/jenkins-operator/README.md b/chart/jenkins-operator/README.md index 5d3006a2..92a25755 100644 --- a/chart/jenkins-operator/README.md +++ b/chart/jenkins-operator/README.md @@ -52,7 +52,7 @@ Kubernetes native operator which fully manages Jenkins on Kubernetes | jenkins.enabled | bool | `true` | | | jenkins.env | list | `[]` | | | jenkins.hostAliases | object | `{}` | | -| jenkins.image | string | `"jenkins/jenkins:2.387.1-lts"` | | +| jenkins.image | string | `"jenkins/jenkins:2.387.2-lts"` | | | jenkins.imagePullPolicy | string | `"Always"` | | | jenkins.imagePullSecrets | list | `[]` | | | jenkins.labels | object | `{}` | | diff --git a/chart/jenkins-operator/values.yaml b/chart/jenkins-operator/values.yaml index 11317378..80de195b 100644 --- a/chart/jenkins-operator/values.yaml +++ b/chart/jenkins-operator/values.yaml @@ -33,7 +33,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.387.1-lts + image: jenkins/jenkins:2.387.2-lts # env contains jenkins container environment variables env: [] @@ -87,19 +87,19 @@ jenkins: # # basePlugins: # - name: kubernetes - # version: 3896.v19b_160fd9589 + # version: 3909.v1f2c633e8590 # - name: workflow-job - # version: 1284.v2fe8ed4573d4 + # version: 1289.vd1c337fd5354 # - name: workflow-aggregator # version: 596.v8c21c963d92d # - name: git # version: 5.0.0 # - name: job-dsl - # version: "1.82" + # version: "1.83" # - name: configuration-as-code - # version: 1569.vb_72405b_80249 + # version: 1625.v27444588cc3d # - name: kubernetes-credentials-provider - # version: 1.209.v862c6e5fb_1ef + # version: 1.211.vc236a_f5a_2f3c basePlugins: [] diff --git a/config.base.env b/config.base.env index b78b3937..78c45675 100644 --- a/config.base.env +++ b/config.base.env @@ -13,5 +13,5 @@ GEN_CRD_API=gen-crd-api-reference-docs IMAGE_PULL_MODE=local HELM_VERSION=3.1.2 CLUSTER_DOMAIN=cluster.local -LATEST_LTS_VERSION=2.387.1 +LATEST_LTS_VERSION=2.387.2 KIND_CLUSTER_NAME=jenkins diff --git a/pkg/plugins/base_plugins.go b/pkg/plugins/base_plugins.go index 65eaceb8..40f9948a 100644 --- a/pkg/plugins/base_plugins.go +++ b/pkg/plugins/base_plugins.go @@ -1,13 +1,13 @@ package plugins const ( - configurationAsCodePlugin = "configuration-as-code:1569.vb_72405b_80249" + configurationAsCodePlugin = "configuration-as-code:1625.v27444588cc3d" gitPlugin = "git:5.0.0" - jobDslPlugin = "job-dsl:1.82" - kubernetesPlugin = "kubernetes:3896.v19b_160fd9589" - kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.209.v862c6e5fb_1ef" + jobDslPlugin = "job-dsl:1.83" + kubernetesPlugin = "kubernetes:3909.v1f2c633e8590" + kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.211.vc236a_f5a_2f3c" workflowAggregatorPlugin = "workflow-aggregator:596.v8c21c963d92d" - workflowJobPlugin = "workflow-job:1284.v2fe8ed4573d4" + workflowJobPlugin = "workflow-job:1289.vd1c337fd5354" ) // basePluginsList contains plugins to install by operator. diff --git a/test/e2e/configuration_test.go b/test/e2e/configuration_test.go index 85453650..04b5ee73 100644 --- a/test/e2e/configuration_test.go +++ b/test/e2e/configuration_test.go @@ -24,13 +24,13 @@ import ( const e2e = "e2e" var expectedBasePluginsList = []plugins.Plugin{ - plugins.Must(plugins.New("configuration-as-code:1569.vb_72405b_80249")), + plugins.Must(plugins.New("configuration-as-code:1625.v27444588cc3d")), plugins.Must(plugins.New("git:5.0.0")), - plugins.Must(plugins.New("kubernetes:3896.v19b_160fd9589")), - plugins.Must(plugins.New("kubernetes-credentials-provider:1.209.v862c6e5fb_1ef")), - plugins.Must(plugins.New("job-dsl:1.82")), + plugins.Must(plugins.New("kubernetes:3909.v1f2c633e8590")), + plugins.Must(plugins.New("kubernetes-credentials-provider:1.211.vc236a_f5a_2f3c")), + plugins.Must(plugins.New("job-dsl:1.83")), plugins.Must(plugins.New("workflow-aggregator:596.v8c21c963d92d")), - plugins.Must(plugins.New("workflow-job:1284.v2fe8ed4573d4")), + plugins.Must(plugins.New("workflow-job:1289.vd1c337fd5354")), } func createUserConfigurationSecret(namespace string, stringData map[string]string) { diff --git a/test/e2e/test_utility.go b/test/e2e/test_utility.go index b5452564..2db6fae8 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.387.1-lts" +const JenkinsTestImage = "jenkins/jenkins:2.387.2-lts" var ( Cfg *rest.Config diff --git a/test/helm/helm_test.go b/test/helm/helm_test.go index a8206b30..185d98b9 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.387.1-lts"), + "--set-string", fmt.Sprintf("jenkins.image=%s", "jenkins/jenkins:2.387.2-lts"), "--set-string", fmt.Sprintf("operator.image=%s", *imageName), "--install") output, err := cmd.CombinedOutput() Expect(err).NotTo(HaveOccurred(), string(output))