From 2c88fe13a8ec8b1e1e07f924a9834f710583b9da Mon Sep 17 00:00:00 2001 From: Luigi Operoso <40476330+brokenpip3@users.noreply.github.com> Date: Tue, 5 Sep 2023 15:21:44 +0200 Subject: [PATCH] chore(jenkins): update latest lts and plugins version (#900) --- README.md | 2 +- chart/jenkins-operator/README.md | 6 +++--- chart/jenkins-operator/values.yaml | 14 +++++++------- config.base.env | 4 ++-- pkg/constants/constants.go | 2 +- pkg/plugins/base_plugins.go | 12 ++++++------ test/e2e/configuration_test.go | 12 ++++++------ test/e2e/test_utility.go | 2 +- test/helm/helm_test.go | 2 +- 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index e5419221..87fe1850 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Jenkins Operator -[![Version](https://img.shields.io/badge/version-v0.8.0-beta2-brightgreen.svg)](https://github.com/jenkinsci/kubernetes-operator/releases/tag/v0.8.0-beta2) +[![Version](https://img.shields.io/badge/version-v0.8.0-brightgreen.svg)](https://github.com/jenkinsci/kubernetes-operator/releases/tag/v0.8.0) [![Build status](https://github.com/jenkinsci/kubernetes-operator/actions/workflows/auto-tests-e2e.yaml/badge.svg)](https://github.com/jenkinsci/kubernetes-operator/actions/workflows/auto-tests-e2e.yaml) [![Go Report Card](https://goreportcard.com/badge/github.com/jenkinsci/kubernetes-operator "Go Report Card")](https://goreportcard.com/report/github.com/jenkinsci/kubernetes-operator) [![Gitter chat](https://badges.gitter.im/jenkinsci/kubernetes-operator.png)](https://gitter.im/jenkinsci/kubernetes-operator) diff --git a/chart/jenkins-operator/README.md b/chart/jenkins-operator/README.md index e550086c..c2df40a5 100644 --- a/chart/jenkins-operator/README.md +++ b/chart/jenkins-operator/README.md @@ -1,6 +1,6 @@ # jenkins-operator -![Version: v0.8.0-beta](https://img.shields.io/badge/Version-v0.8.0--beta-informational?style=flat-square) ![AppVersion: v0.8.0-beta](https://img.shields.io/badge/AppVersion-v0.8.0--beta-informational?style=flat-square) +![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) Kubernetes native operator which fully manages Jenkins on Kubernetes @@ -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.401.1-lts"` | | +| jenkins.image | string | `"jenkins/jenkins:2.414.1-lts"` | | | jenkins.imagePullPolicy | string | `"Always"` | | | jenkins.imagePullSecrets | list | `[]` | | | jenkins.labels | object | `{}` | | @@ -95,7 +95,7 @@ Kubernetes native operator which fully manages Jenkins on Kubernetes | jenkins.volumes[0].persistentVolumeClaim.claimName | string | `"jenkins-backup"` | | | operator.affinity | object | `{}` | | | operator.fullnameOverride | string | `""` | | -| operator.image | string | `"quay.io/jenkins-kubernetes-operator/operator:v0.8.0-beta2"` | | +| operator.image | string | `"quay.io/jenkins-kubernetes-operator/operator:v0.8.0"` | | | operator.imagePullPolicy | string | `"IfNotPresent"` | | | operator.imagePullSecrets | list | `[]` | | | operator.nameOverride | string | `""` | | diff --git a/chart/jenkins-operator/values.yaml b/chart/jenkins-operator/values.yaml index 58ceb661..28f622dc 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.401.1-lts + image: jenkins/jenkins:2.414.1-lts # env contains jenkins container environment variables env: [] @@ -90,19 +90,19 @@ jenkins: # # basePlugins: # - name: kubernetes - # version: 3937.vd7b_82db_e347b_ + # version: 4029.v5712230ccb_f8 # - name: workflow-job - # version: 1308.v58d48a_763b_31 + # version: 1342.v046651d5b_dfe # - name: workflow-aggregator # version: 596.v8c21c963d92d # - name: git - # version: 5.0.2 + # version: 5.2.0 # - name: job-dsl - # version: "1.84" + # version: "1.85" # - name: configuration-as-code # version: 1647.ve39ca_b_829b_42 # - name: kubernetes-credentials-provider - # version: 1.211.vc236a_f5a_2f3c + # version: 1.234.vf3013b_35f5b_a basePlugins: [] @@ -294,7 +294,7 @@ operator: replicaCount: 1 # image is the name (and tag) of the Jenkins Operator image - image: quay.io/jenkins-kubernetes-operator/operator:v0.8.0-beta2 + image: quay.io/jenkins-kubernetes-operator/operator:v0.8.0 # imagePullPolicy defines policy for pulling images imagePullPolicy: IfNotPresent diff --git a/config.base.env b/config.base.env index 600d7fb9..835a8b36 100644 --- a/config.base.env +++ b/config.base.env @@ -11,7 +11,7 @@ API_VERSION_NEXT=v1alpha3 ALL_IN_ONE_DEPLOY_FILE_PREFIX=all-in-one GEN_CRD_API=gen-crd-api-reference-docs IMAGE_PULL_MODE=local -HELM_VERSION=3.12.1 +HELM_VERSION=3.12.3 CLUSTER_DOMAIN=cluster.local -LATEST_LTS_VERSION=2.401.1 +LATEST_LTS_VERSION=2.414.1 KIND_CLUSTER_NAME=jenkins diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go index 49c23ac4..5ac3dc97 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.401.1-lts" + DefaultJenkinsMasterImage = "jenkins/jenkins:2.414.1-lts" // DefaultHTTPPortInt32 is the default Jenkins HTTP port DefaultHTTPPortInt32 = int32(8080) // DefaultSlavePortInt32 is the default Jenkins port for slaves diff --git a/pkg/plugins/base_plugins.go b/pkg/plugins/base_plugins.go index 4961a937..6ea8f56f 100644 --- a/pkg/plugins/base_plugins.go +++ b/pkg/plugins/base_plugins.go @@ -1,13 +1,13 @@ package plugins const ( - configurationAsCodePlugin = "configuration-as-code:1647.ve39ca_b_829b_42" - gitPlugin = "git:5.1.0" - jobDslPlugin = "job-dsl:1.84" - kubernetesPlugin = "kubernetes:3952.v88e3b_0cf300b_" - kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.225.v14f9e6b_28f53" + configurationAsCodePlugin = "configuration-as-code:1700.v6f448841296e" + gitPlugin = "git:5.2.0" + jobDslPlugin = "job-dsl:1.85" + kubernetesPlugin = "kubernetes:4029.v5712230ccb_f8" + kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.234.vf3013b_35f5b_a" workflowAggregatorPlugin = "workflow-aggregator:596.v8c21c963d92d" - workflowJobPlugin = "workflow-job:1308.v58d48a_763b_31" + workflowJobPlugin = "workflow-job:1342.v046651d5b_dfe" ) // basePluginsList contains plugins to install by operator. diff --git a/test/e2e/configuration_test.go b/test/e2e/configuration_test.go index 1a924c87..9e56e188 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:1647.ve39ca_b_829b_42")), - plugins.Must(plugins.New("git:5.1.0")), - plugins.Must(plugins.New("kubernetes:3952.v88e3b_0cf300b_")), - plugins.Must(plugins.New("kubernetes-credentials-provider:1.225.v14f9e6b_28f53")), - plugins.Must(plugins.New("job-dsl:1.84")), + plugins.Must(plugins.New("configuration-as-code:1700.v6f448841296e")), + plugins.Must(plugins.New("git:5.2.0")), + plugins.Must(plugins.New("kubernetes:4029.v5712230ccb_f8")), + plugins.Must(plugins.New("kubernetes-credentials-provider:1.234.vf3013b_35f5b_a")), + plugins.Must(plugins.New("job-dsl:1.85")), plugins.Must(plugins.New("workflow-aggregator:596.v8c21c963d92d")), - plugins.Must(plugins.New("workflow-job:1308.v58d48a_763b_31")), + plugins.Must(plugins.New("workflow-job:1342.v046651d5b_dfe")), } func createUserConfigurationSecret(namespace string, stringData map[string]string) { diff --git a/test/e2e/test_utility.go b/test/e2e/test_utility.go index 45776235..c08417eb 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.401.1-lts" +const JenkinsTestImage = "jenkins/jenkins:2.414.1-lts" var ( Cfg *rest.Config diff --git a/test/helm/helm_test.go b/test/helm/helm_test.go index 98c76b94..1b7ad4c0 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.401.1-lts"), + "--set-string", fmt.Sprintf("jenkins.image=%s", "jenkins/jenkins:2.414.1-lts"), "--set-string", fmt.Sprintf("operator.image=%s", *imageName), "--install") output, err := cmd.CombinedOutput() Expect(err).NotTo(HaveOccurred(), string(output))