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

chore(update): use latest jenkins lts: 2.375.3 (#796)

This commit is contained in:
Luigi Operoso 2023-03-07 00:09:23 +01:00 committed by GitHub
parent cd2efd6722
commit e9fbe575a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,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.375.2-lts image: jenkins/jenkins:2.375.3-lts
# env contains jenkins container environment variables # env contains jenkins container environment variables
env: [] env: []
@ -64,7 +64,7 @@ jenkins:
# validateSecurityWarnings enables or disables validating potential security warnings in Jenkins plugins via admission webhooks. # validateSecurityWarnings enables or disables validating potential security warnings in Jenkins plugins via admission webhooks.
validateSecurityWarnings: false validateSecurityWarnings: false
# imagePullSecrets is used if you want to pull images from private repository # imagePullSecrets is used if you want to pull images from private repository
# See https://jenkinsci.github.io/kubernetes-operator/docs/getting-started/latest/configuration/#pulling-docker-images-from-private-repositories for more info # See https://jenkinsci.github.io/kubernetes-operator/docs/getting-started/latest/configuration/#pulling-docker-images-from-private-repositories for more info
imagePullSecrets: [] imagePullSecrets: []
@ -87,9 +87,9 @@ jenkins:
# #
# basePlugins: # basePlugins:
# - name: kubernetes # - name: kubernetes
# version: 3802.vb_b_600831fcb_3 # version: 3883.v4d70a_a_a_df034
# - name: workflow-job # - name: workflow-job
# version: 1254.v3f64639b_11dd # version: 1282.ve6d865025906
# - name: workflow-aggregator # - name: workflow-aggregator
# version: 590.v6a_d052e5a_a_b_5 # version: 590.v6a_d052e5a_a_b_5
# - name: git # - name: git
@ -99,7 +99,7 @@ jenkins:
# - name: configuration-as-code # - name: configuration-as-code
# version: 1569.vb_72405b_80249 # version: 1569.vb_72405b_80249
# - name: kubernetes-credentials-provider # - name: kubernetes-credentials-provider
# version: 1.208.v128ee9800c04 # version: 1.209.v862c6e5fb_1ef
basePlugins: [] basePlugins: []
@ -311,8 +311,8 @@ webhook:
# validity of the certificate # validity of the certificate
duration: 2160h duration: 2160h
# time after which the certificate will be automatically renewed # time after which the certificate will be automatically renewed
renewbefore: 360h renewbefore: 360h
# enable or disable the validation webhook # enable or disable the validation webhook
enabled: false enabled: false

6
pkg/plugins/base_plugins.go
View File

@ -4,10 +4,10 @@ const (
configurationAsCodePlugin = "configuration-as-code:1569.vb_72405b_80249" configurationAsCodePlugin = "configuration-as-code:1569.vb_72405b_80249"
gitPlugin = "git:5.0.0" gitPlugin = "git:5.0.0"
jobDslPlugin = "job-dsl:1.81" jobDslPlugin = "job-dsl:1.81"
kubernetesPlugin = "kubernetes:3802.vb_b_600831fcb_3" kubernetesPlugin = "kubernetes:3883.v4d70a_a_a_df034"
kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.208.v128ee9800c04" kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.209.v862c6e5fb_1ef"
workflowAggregatorPlugin = "workflow-aggregator:590.v6a_d052e5a_a_b_5" workflowAggregatorPlugin = "workflow-aggregator:590.v6a_d052e5a_a_b_5"
workflowJobPlugin = "workflow-job:1254.v3f64639b_11dd" workflowJobPlugin = "workflow-job:1282.ve6d865025906"
) )
// basePluginsList contains plugins to install by operator. // basePluginsList contains plugins to install by operator.

6
test/e2e/configuration_test.go
View File

@ -26,11 +26,11 @@ const e2e = "e2e"
var expectedBasePluginsList = []plugins.Plugin{ var expectedBasePluginsList = []plugins.Plugin{
plugins.Must(plugins.New("configuration-as-code:1569.vb_72405b_80249")), plugins.Must(plugins.New("configuration-as-code:1569.vb_72405b_80249")),
plugins.Must(plugins.New("git:5.0.0")), plugins.Must(plugins.New("git:5.0.0")),
plugins.Must(plugins.New("kubernetes:3802.vb_b_600831fcb_3")), plugins.Must(plugins.New("kubernetes:3883.v4d70a_a_a_df034")),
plugins.Must(plugins.New("kubernetes-credentials-provider:1.208.v128ee9800c04")), plugins.Must(plugins.New("kubernetes-credentials-provider:1.209.v862c6e5fb_1ef")),
plugins.Must(plugins.New("job-dsl:1.81")), plugins.Must(plugins.New("job-dsl:1.81")),
plugins.Must(plugins.New("workflow-aggregator:590.v6a_d052e5a_a_b_5")), plugins.Must(plugins.New("workflow-aggregator:590.v6a_d052e5a_a_b_5")),
plugins.Must(plugins.New("workflow-job:1254.v3f64639b_11dd")), plugins.Must(plugins.New("workflow-job:1282.ve6d865025906")),
} }
func createUserConfigurationSecret(namespace string, stringData map[string]string) { func createUserConfigurationSecret(namespace string, stringData map[string]string) {

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.375.2-lts" const JenkinsTestImage = "jenkins/jenkins:2.375.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.375.2-lts"), "--set-string", fmt.Sprintf("jenkins.image=%s", "jenkins/jenkins:2.375.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))