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

#554 Remove Deprecated JVM opts (#569) 

* Upgrade base plugins
* Upgrade Jenkins image
* Remove deprecated JVM opts
This commit is contained in:
MKajzik 2021-05-20 17:22:00 +02:00 committed by GitHub
parent 30723cf6f8
commit 59d522c5d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 38 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/v1alpha2/jenkins_types.go
View File

@ -343,19 +343,19 @@ type JenkinsMaster struct {
// +optional // +optional
// Defaults to : // Defaults to :
// - name: kubernetes // - name: kubernetes
// version: "1.28.6" // version: "1.29.4"
// - name: workflow-job // - name: workflow-job
// version: "2.40" // version: "2.40"
// - name: workflow-aggregator // - name: workflow-aggregator
// version: "2.6" // version: "2.6"
// - name: git // - name: git
// version: "4.5.0" // version: "4.6.0"
// - name: job-dsl // - name: job-dsl
// version: "1.77" // version: "1.77"
// - name: configuration-as-code // - name: configuration-as-code
// version: "1.46" // version: "1.51"
// - name: kubernetes-credentials-provider // - name: kubernetes-credentials-provider
// version: "0.15" // version: "0.18-1"
BasePlugins []Plugin `json:"basePlugins,omitempty"` BasePlugins []Plugin `json:"basePlugins,omitempty"`
// Plugins contains plugins required by user // Plugins contains plugins required by user

8
chart/jenkins-operator/crds/jenkins-crd.yaml
View File

@ -157,11 +157,11 @@ spec:
type: object type: object
basePlugins: basePlugins:
description: 'BasePlugins contains plugins required by operator description: 'BasePlugins contains plugins required by operator
Defaults to : - name: kubernetes version: "1.28.6" - name: workflow-job Defaults to : - name: kubernetes version: "1.29.4" - name: workflow-job
version: "2.40" - name: workflow-aggregator version: "2.6" - version: "2.40" - name: workflow-aggregator version: "2.6" -
name: git version: "4.5.0" - name: job-dsl version: "1.77" - name: git version: "4.6.0" - name: job-dsl version: "1.77" -
name: configuration-as-code version: "1.46" - name: kubernetes-credentials-provider name: configuration-as-code version: "1.51" - name: kubernetes-credentials-provider
version: "0.15"' version: "0.18-1"'
items: items:
description: Plugin defines Jenkins plugin. description: Plugin defines Jenkins plugin.
properties: properties:

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

@ -29,7 +29,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.263.2-lts-alpine image: jenkins/jenkins:2.277.4-lts-alpine
# env contains jenkins container environment variables # env contains jenkins container environment variables
env: [] env: []
@ -63,34 +63,34 @@ jenkins:
# #
# basePlugins: # basePlugins:
# - name: kubernetes # - name: kubernetes
# version: 1.29.2 # version: 1.29.4
# - name: workflow-job # - name: workflow-job
# version: "2.40" # version: "2.40"
# - name: workflow-aggregator # - name: workflow-aggregator
# version: "2.6" # version: "2.6"
# - name: git # - name: git
# version: 4.5.0 # version: 4.6.0
# - name: job-dsl # - name: job-dsl
# version: "1.77" # version: "1.77"
# - name: configuration-as-code # - name: configuration-as-code
# version: "1.47" # version: "1.50"
# - name: kubernetes-credentials-provider # - name: kubernetes-credentials-provider
# version: 0.15 # version: 0.18-1
basePlugins: basePlugins:
- name: kubernetes - name: kubernetes
version: "1.29.2" version: "1.29.4"
- name: workflow-job - name: workflow-job
version: "2.40" version: "2.40"
- name: workflow-aggregator - name: workflow-aggregator
version: "2.6" version: "2.6"
- name: git - name: git
version: "4.5.0" version: "4.6.0"
- name: job-dsl - name: job-dsl
version: "1.77" version: "1.77"
- name: configuration-as-code - name: configuration-as-code
version: "1.47" version: "1.51"
- name: kubernetes-credentials-provider - name: kubernetes-credentials-provider
version: "0.15" version: "0.18-1"
# plugins are plugins required by the user # plugins are plugins required by the user
# You can define plugins here # You can define plugins here

8
config/crd/bases/jenkins.io_jenkins.yaml
View File

@ -157,11 +157,11 @@ spec:
type: object type: object
basePlugins: basePlugins:
description: 'BasePlugins contains plugins required by operator description: 'BasePlugins contains plugins required by operator
Defaults to : - name: kubernetes version: "1.28.6" - name: workflow-job Defaults to : - name: kubernetes version: "1.29.4" - name: workflow-job
version: "2.40" - name: workflow-aggregator version: "2.6" - version: "2.40" - name: workflow-aggregator version: "2.6" -
name: git version: "4.5.0" - name: job-dsl version: "1.77" - name: git version: "4.6.0" - name: job-dsl version: "1.77" -
name: configuration-as-code version: "1.46" - name: kubernetes-credentials-provider name: configuration-as-code version: "1.51" - name: kubernetes-credentials-provider
version: "0.15"' version: "0.18-1"'
items: items:
description: Plugin defines Jenkins plugin. description: Plugin defines Jenkins plugin.
properties: properties:

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

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

2
controllers/jenkins_controller.go
View File

@ -388,7 +388,7 @@ func (r *JenkinsReconciler) setDefaults(jenkins *v1alpha2.Jenkins) (requeue bool
changed = true changed = true
jenkinsContainer.Env = append(jenkinsContainer.Env, corev1.EnvVar{ jenkinsContainer.Env = append(jenkinsContainer.Env, corev1.EnvVar{
Name: constants.JavaOpsVariableName, Name: constants.JavaOpsVariableName,
Value: "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:MaxRAMFraction=1 -Djenkins.install.runSetupWizard=false -Djava.awt.headless=true", Value: "-XX:MinRAMPercentage=50.0 -XX:MaxRAMPercentage=80.0 -Djenkins.install.runSetupWizard=false -Djava.awt.headless=true",
}) })
} }
if len(jenkins.Spec.Master.BasePlugins) == 0 { if len(jenkins.Spec.Master.BasePlugins) == 0 {

6
deploy/crds/jenkins.io_jenkins_crd.yaml
View File

@ -151,10 +151,10 @@ spec:
type: object type: object
basePlugins: basePlugins:
description: 'BasePlugins contains plugins required by operator description: 'BasePlugins contains plugins required by operator
Defaults to : - name: kubernetes version: 1.15.7 - name: workflow-job Defaults to : - name: kubernetes version: 1.29.4 - name: workflow-job
version: "2.39" - name: workflow-aggregator version: "2.6" - name: version: "2.39" - name: workflow-aggregator version: "2.6" - name:
git version: 3.10.0 - name: job-dsl version: "1.74" - name: configuration-as-code git version: 4.6.0 - name: job-dsl version: "1.74" - name: configuration-as-code
version: "1.19" - name: kubernetes-credentials-provider version: 0.12.1' version: "1.51" - name: kubernetes-credentials-provider version: 0.18-1'
items: items:
description: Plugin defines Jenkins plugin description: Plugin defines Jenkins plugin
properties: properties:

2
deploy/crds/jenkins_v1alpha2_jenkins_cr.yaml
View File

@ -6,7 +6,7 @@ spec:
master: master:
containers: containers:
- name: jenkins-master - name: jenkins-master
image: jenkins/jenkins:2.263.2-lts-alpine image: jenkins/jenkins:2.277.4-lts-alpine
seedJobs: seedJobs:
- id: jenkins-operator - id: jenkins-operator
targets: "cicd/jobs/*.jenkins" targets: "cicd/jobs/*.jenkins"

10
deploy/crds/jenkins_v1alpha2_jenkinsimage_cr.yaml
View File

@ -5,20 +5,20 @@ metadata:
spec: spec:
image: image:
name: jenkins/jenkins name: jenkins/jenkins
tag: 2.263.1-lts-alpine tag: 2.277.4-lts-alpine
plugins: plugins:
- name: kubernetes - name: kubernetes
version: "1.28.6" version: "1.29.4"
- name: workflow-job - name: workflow-job
version: "2.40" version: "2.40"
- name: workflow-aggregator - name: workflow-aggregator
version: "2.6" version: "2.6"
- name: git - name: git
version: "4.5.0" version: "4.6.0"
- name: job-dsl - name: job-dsl
version: "1.77" version: "1.77"
- name: configuration-as-code - name: configuration-as-code
version: "1.46" version: "1.51"
- name: kubernetes-credentials-provider - name: kubernetes-credentials-provider
version: "0.15" version: "0.18-1"

3
deploy/crds/openshift_jenkins_v1alpha2_jenkins_cr.yaml
View File

@ -33,8 +33,7 @@ spec:
value: /var/lib/jenkins value: /var/lib/jenkins
- name: JAVA_OPTS - name: JAVA_OPTS
value: >- value: >-
-XX:+UnlockExperimentalVMOptions -XX:+UnlockExperimentalVMOptions -XX:MinRAMPercentage=50.0 -XX:MaxRAMPercentage=80.0
-XX:+UseCGroupMemoryLimitForHeap -XX:MaxRAMFraction=1
-Djenkins.install.runSetupWizard=false -Djava.awt.headless=true -Djenkins.install.runSetupWizard=false -Djava.awt.headless=true
image: 'quay.io/openshift/origin-jenkins:latest' image: 'quay.io/openshift/origin-jenkins:latest'
imagePullPolicy: Always imagePullPolicy: Always

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

8
pkg/plugins/base_plugins.go
View File

@ -1,11 +1,11 @@
package plugins package plugins
const ( const (
configurationAsCodePlugin = "configuration-as-code:1.47" configurationAsCodePlugin = "configuration-as-code:1.51"
gitPlugin = "git:4.5.0" gitPlugin = "git:4.6.0"
jobDslPlugin = "job-dsl:1.77" jobDslPlugin = "job-dsl:1.77"
kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:0.15" kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:0.18-1"
kubernetesPlugin = "kubernetes:1.29.0" kubernetesPlugin = "kubernetes:1.29.4"
workflowAggregatorPlugin = "workflow-aggregator:2.6" workflowAggregatorPlugin = "workflow-aggregator:2.6"
workflowJobPlugin = "workflow-job:2.40" workflowJobPlugin = "workflow-job:2.40"
) )