diff --git a/api/v1alpha2/jenkins_types.go b/api/v1alpha2/jenkins_types.go index 0895cd96..40d5891f 100644 --- a/api/v1alpha2/jenkins_types.go +++ b/api/v1alpha2/jenkins_types.go @@ -343,19 +343,19 @@ type JenkinsMaster struct { // +optional // Defaults to : // - name: kubernetes - // version: "1.28.6" + // version: "1.29.4" // - name: workflow-job // version: "2.40" // - name: workflow-aggregator // version: "2.6" // - name: git - // version: "4.5.0" + // version: "4.6.0" // - name: job-dsl // version: "1.77" // - name: configuration-as-code - // version: "1.46" + // version: "1.51" // - name: kubernetes-credentials-provider - // version: "0.15" + // version: "0.18-1" BasePlugins []Plugin `json:"basePlugins,omitempty"` // Plugins contains plugins required by user diff --git a/chart/jenkins-operator/crds/jenkins-crd.yaml b/chart/jenkins-operator/crds/jenkins-crd.yaml index f3202164..2ac7ec77 100644 --- a/chart/jenkins-operator/crds/jenkins-crd.yaml +++ b/chart/jenkins-operator/crds/jenkins-crd.yaml @@ -157,11 +157,11 @@ spec: type: object basePlugins: 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" - - name: git version: "4.5.0" - name: job-dsl version: "1.77" - - name: configuration-as-code version: "1.46" - name: kubernetes-credentials-provider - version: "0.15"' + name: git version: "4.6.0" - name: job-dsl version: "1.77" - + name: configuration-as-code version: "1.51" - name: kubernetes-credentials-provider + version: "0.18-1"' items: description: Plugin defines Jenkins plugin. properties: diff --git a/chart/jenkins-operator/values.yaml b/chart/jenkins-operator/values.yaml index 9670c5f2..bf417dbe 100644 --- a/chart/jenkins-operator/values.yaml +++ b/chart/jenkins-operator/values.yaml @@ -29,7 +29,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.263.2-lts-alpine + image: jenkins/jenkins:2.277.4-lts-alpine # env contains jenkins container environment variables env: [] @@ -63,34 +63,34 @@ jenkins: # # basePlugins: # - name: kubernetes - # version: 1.29.2 + # version: 1.29.4 # - name: workflow-job # version: "2.40" # - name: workflow-aggregator # version: "2.6" # - name: git - # version: 4.5.0 + # version: 4.6.0 # - name: job-dsl # version: "1.77" # - name: configuration-as-code - # version: "1.47" + # version: "1.50" # - name: kubernetes-credentials-provider - # version: 0.15 + # version: 0.18-1 basePlugins: - name: kubernetes - version: "1.29.2" + version: "1.29.4" - name: workflow-job version: "2.40" - name: workflow-aggregator version: "2.6" - name: git - version: "4.5.0" + version: "4.6.0" - name: job-dsl version: "1.77" - name: configuration-as-code - version: "1.47" + version: "1.51" - name: kubernetes-credentials-provider - version: "0.15" + version: "0.18-1" # plugins are plugins required by the user # You can define plugins here diff --git a/config/crd/bases/jenkins.io_jenkins.yaml b/config/crd/bases/jenkins.io_jenkins.yaml index 0ecdbf00..2c047972 100644 --- a/config/crd/bases/jenkins.io_jenkins.yaml +++ b/config/crd/bases/jenkins.io_jenkins.yaml @@ -157,11 +157,11 @@ spec: type: object basePlugins: 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" - - name: git version: "4.5.0" - name: job-dsl version: "1.77" - - name: configuration-as-code version: "1.46" - name: kubernetes-credentials-provider - version: "0.15"' + name: git version: "4.6.0" - name: job-dsl version: "1.77" - + name: configuration-as-code version: "1.51" - name: kubernetes-credentials-provider + version: "0.18-1"' items: description: Plugin defines Jenkins plugin. properties: diff --git a/config/samples/jenkins.io_v1alpha2_jenkins.yaml b/config/samples/jenkins.io_v1alpha2_jenkins.yaml index c44357b6..b451d5da 100644 --- a/config/samples/jenkins.io_v1alpha2_jenkins.yaml +++ b/config/samples/jenkins.io_v1alpha2_jenkins.yaml @@ -18,7 +18,7 @@ spec: disableCSRFProtection: false containers: - name: jenkins-master - image: jenkins/jenkins:2.263.3-lts-alpine + image: jenkins/jenkins:2.277.4-lts-alpine imagePullPolicy: Always livenessProbe: failureThreshold: 12 diff --git a/controllers/jenkins_controller.go b/controllers/jenkins_controller.go index 00528b72..7eb92454 100644 --- a/controllers/jenkins_controller.go +++ b/controllers/jenkins_controller.go @@ -388,7 +388,7 @@ func (r *JenkinsReconciler) setDefaults(jenkins *v1alpha2.Jenkins) (requeue bool changed = true jenkinsContainer.Env = append(jenkinsContainer.Env, corev1.EnvVar{ 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 { diff --git a/deploy/crds/jenkins.io_jenkins_crd.yaml b/deploy/crds/jenkins.io_jenkins_crd.yaml index 1d4e96c4..85e1ae01 100644 --- a/deploy/crds/jenkins.io_jenkins_crd.yaml +++ b/deploy/crds/jenkins.io_jenkins_crd.yaml @@ -151,10 +151,10 @@ spec: type: object basePlugins: 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: - git version: 3.10.0 - name: job-dsl version: "1.74" - name: configuration-as-code - version: "1.19" - name: kubernetes-credentials-provider version: 0.12.1' + git version: 4.6.0 - name: job-dsl version: "1.74" - name: configuration-as-code + version: "1.51" - name: kubernetes-credentials-provider version: 0.18-1' items: description: Plugin defines Jenkins plugin properties: diff --git a/deploy/crds/jenkins_v1alpha2_jenkins_cr.yaml b/deploy/crds/jenkins_v1alpha2_jenkins_cr.yaml index 582c8977..19c822b5 100644 --- a/deploy/crds/jenkins_v1alpha2_jenkins_cr.yaml +++ b/deploy/crds/jenkins_v1alpha2_jenkins_cr.yaml @@ -6,7 +6,7 @@ spec: master: containers: - name: jenkins-master - image: jenkins/jenkins:2.263.2-lts-alpine + image: jenkins/jenkins:2.277.4-lts-alpine seedJobs: - id: jenkins-operator targets: "cicd/jobs/*.jenkins" diff --git a/deploy/crds/jenkins_v1alpha2_jenkinsimage_cr.yaml b/deploy/crds/jenkins_v1alpha2_jenkinsimage_cr.yaml index cda0a0fc..c761b94e 100644 --- a/deploy/crds/jenkins_v1alpha2_jenkinsimage_cr.yaml +++ b/deploy/crds/jenkins_v1alpha2_jenkinsimage_cr.yaml @@ -5,20 +5,20 @@ metadata: spec: image: name: jenkins/jenkins - tag: 2.263.1-lts-alpine + tag: 2.277.4-lts-alpine plugins: - name: kubernetes - version: "1.28.6" + version: "1.29.4" - name: workflow-job version: "2.40" - name: workflow-aggregator version: "2.6" - name: git - version: "4.5.0" + version: "4.6.0" - name: job-dsl version: "1.77" - name: configuration-as-code - version: "1.46" + version: "1.51" - name: kubernetes-credentials-provider - version: "0.15" + version: "0.18-1" diff --git a/deploy/crds/openshift_jenkins_v1alpha2_jenkins_cr.yaml b/deploy/crds/openshift_jenkins_v1alpha2_jenkins_cr.yaml index 9942813a..e643e00a 100644 --- a/deploy/crds/openshift_jenkins_v1alpha2_jenkins_cr.yaml +++ b/deploy/crds/openshift_jenkins_v1alpha2_jenkins_cr.yaml @@ -33,8 +33,7 @@ spec: value: /var/lib/jenkins - name: JAVA_OPTS value: >- - -XX:+UnlockExperimentalVMOptions -XX:+UnlockExperimentalVMOptions - -XX:+UseCGroupMemoryLimitForHeap -XX:MaxRAMFraction=1 + -XX:MinRAMPercentage=50.0 -XX:MaxRAMPercentage=80.0 -Djenkins.install.runSetupWizard=false -Djava.awt.headless=true image: 'quay.io/openshift/origin-jenkins:latest' imagePullPolicy: Always diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go index abb5b5d1..bde8d460 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.263.2-lts-alpine" + DefaultJenkinsMasterImage = "jenkins/jenkins:2.277.4-lts-alpine" // 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 7f8a761b..5cff20fb 100644 --- a/pkg/plugins/base_plugins.go +++ b/pkg/plugins/base_plugins.go @@ -1,11 +1,11 @@ package plugins const ( - configurationAsCodePlugin = "configuration-as-code:1.47" - gitPlugin = "git:4.5.0" + configurationAsCodePlugin = "configuration-as-code:1.51" + gitPlugin = "git:4.6.0" jobDslPlugin = "job-dsl:1.77" - kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:0.15" - kubernetesPlugin = "kubernetes:1.29.0" + kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:0.18-1" + kubernetesPlugin = "kubernetes:1.29.4" workflowAggregatorPlugin = "workflow-aggregator:2.6" workflowJobPlugin = "workflow-job:2.40" )