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

Merge pull request #670 from manut/bugfix_669 

Update jenkins base plugins to latest version (#669)
This commit is contained in:
SylwiaBrant 2021-10-20 16:33:45 +02:00 committed by GitHub
parent 75826d5367 e03ca0674a
commit e27992ba9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,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.277.4-lts-alpine image: jenkins/jenkins:2.303.2-lts-alpine
# env contains jenkins container environment variables # env contains jenkins container environment variables
env: [] env: []

2
config/samples/jenkins.io_v1alpha2_jenkins.yaml
View File

@ -19,7 +19,7 @@ spec:
disableCSRFProtection: false disableCSRFProtection: false
containers: containers:
- name: jenkins-master - name: jenkins-master
image: jenkins/jenkins:2.277.4-lts-alpine image: jenkins/jenkins:2.303.2-lts-alpine
imagePullPolicy: Always imagePullPolicy: Always
livenessProbe: livenessProbe:
failureThreshold: 12 failureThreshold: 12

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.277.4-lts-alpine" DefaultJenkinsMasterImage = "jenkins/jenkins:2.303.2-lts-alpine"
// 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

10
pkg/plugins/base_plugins.go
View File

@ -1,13 +1,13 @@
package plugins package plugins
const ( const (
configurationAsCodePlugin = "configuration-as-code:1.51" configurationAsCodePlugin = "configuration-as-code:1.54"
gitPlugin = "git:4.7.2" gitPlugin = "git:4.9.0"
jobDslPlugin = "job-dsl:1.77" jobDslPlugin = "job-dsl:1.77"
kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:0.18-1" kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:0.20"
kubernetesPlugin = "kubernetes:1.30.0" kubernetesPlugin = "kubernetes:1.30.4"
workflowAggregatorPlugin = "workflow-aggregator:2.6" workflowAggregatorPlugin = "workflow-aggregator:2.6"
workflowJobPlugin = "workflow-job:2.41" workflowJobPlugin = "workflow-job:2.42"
) )
// basePluginsList contains plugins to install by operator. // basePluginsList contains plugins to install by operator.

6
test/e2e/jenkins_test.go
View File

@ -113,9 +113,9 @@ func createJenkinsCR(name, namespace string, seedJob *[]v1alpha2.SeedJob, groovy
}, },
}, },
Plugins: []v1alpha2.Plugin{ Plugins: []v1alpha2.Plugin{
{Name: "audit-trail", Version: "3.7"}, {Name: "audit-trail", Version: "3.10"},
{Name: "simple-theme-plugin", Version: "0.6"}, {Name: "simple-theme-plugin", Version: "0.7"},
{Name: "github", Version: "1.32.0"}, {Name: "github", Version: "1.34.1"},
{Name: "devoptics", Version: "1.1934", DownloadURL: "https://jenkins-updates.cloudbees.com/download/plugins/devoptics/1.1934/devoptics.hpi"}, {Name: "devoptics", Version: "1.1934", DownloadURL: "https://jenkins-updates.cloudbees.com/download/plugins/devoptics/1.1934/devoptics.hpi"},
}, },
PriorityClassName: priorityClassName, PriorityClassName: priorityClassName,