diff --git a/README.md b/README.md index 62cb84178..823da1e3e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Jenkins Operator -[![Version](https://img.shields.io/badge/version-v0.4.0-brightgreen.svg)](https://github.com/jenkinsci/kubernetes-operator/releases/tag/v0.4.0) +[![Version](https://img.shields.io/badge/version-v0.5.0-brightgreen.svg)](https://github.com/jenkinsci/kubernetes-operator/releases/tag/v0.5.0) [![Build Status](https://travis-ci.org/jenkinsci/kubernetes-operator.svg?branch=master)](https://travis-ci.org/jenkinsci/kubernetes-operator) [![Go Report Card](https://goreportcard.com/badge/github.com/jenkinsci/kubernetes-operator "Go Report Card")](https://goreportcard.com/report/github.com/jenkinsci/kubernetes-operator) [![Docker Pulls](https://img.shields.io/docker/pulls/virtuslab/jenkins-operator.svg)](https://hub.docker.com/r/virtuslab/jenkins-operator/tags) diff --git a/VERSION.txt b/VERSION.txt index fb7a04cff..b043aa648 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -v0.4.0 +v0.5.0 diff --git a/chart/jenkins-operator/values.yaml b/chart/jenkins-operator/values.yaml index 8f39b5ceb..570fc8762 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.249.3-lts-alpine + image: jenkins/jenkins:2.263.2-lts-alpine # env contains jenkins container environment variables env: [] @@ -63,13 +63,13 @@ jenkins: # # basePlugins: # - name: kubernetes - # version: 1.27.6 + # version: 1.28.6 # - name: workflow-job # version: "2.40" # - name: workflow-aggregator # version: "2.6" # - name: git - # version: 4.4.5 + # version: 4.5.0 # - name: job-dsl # version: "1.77" # - name: configuration-as-code @@ -78,13 +78,13 @@ jenkins: # version: 0.15 basePlugins: - name: kubernetes - version: "1.27.6" + version: "1.28.6" - name: workflow-job version: "2.40" - name: workflow-aggregator version: "2.6" - name: git - version: "4.4.5" + version: "4.5.0" - name: job-dsl version: "1.77" - name: configuration-as-code diff --git a/deploy/all-in-one-v1alpha2.yaml b/deploy/all-in-one-v1alpha2.yaml index 8c4e1950c..4f013d84b 100644 --- a/deploy/all-in-one-v1alpha2.yaml +++ b/deploy/all-in-one-v1alpha2.yaml @@ -93,6 +93,16 @@ rules: - get - list - watch + - apiGroups: + - "route.openshift.io" + resources: + - routes + verbs: + - get + - list + - watch + - create + - update - apiGroups: - "image.openshift.io" resources: @@ -140,7 +150,7 @@ spec: serviceAccountName: jenkins-operator containers: - name: jenkins-operator - image: virtuslab/jenkins-operator:v0.4.0 + image: virtuslab/jenkins-operator:v0.5.0 command: - jenkins-operator args: [] diff --git a/deploy/crds/jenkins_v1alpha2_jenkins_cr.yaml b/deploy/crds/jenkins_v1alpha2_jenkins_cr.yaml index 0fe81b4a3..582c89778 100644 --- a/deploy/crds/jenkins_v1alpha2_jenkins_cr.yaml +++ b/deploy/crds/jenkins_v1alpha2_jenkins_cr.yaml @@ -6,35 +6,7 @@ spec: master: containers: - name: jenkins-master - image: jenkins/jenkins:2.249.3-lts-alpine - imagePullPolicy: Always - livenessProbe: - failureThreshold: 12 - httpGet: - path: /login - port: http - scheme: HTTP - initialDelaySeconds: 80 - periodSeconds: 10 - successThreshold: 1 - timeoutSeconds: 5 - readinessProbe: - failureThreshold: 3 - httpGet: - path: /login - port: http - scheme: HTTP - initialDelaySeconds: 30 - periodSeconds: 10 - successThreshold: 1 - timeoutSeconds: 1 - resources: - limits: - cpu: 1500m - memory: 3Gi - requests: - cpu: "1" - memory: 500Mi + image: jenkins/jenkins:2.263.2-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 623055ed5..cda0a0fcd 100644 --- a/deploy/crds/jenkins_v1alpha2_jenkinsimage_cr.yaml +++ b/deploy/crds/jenkins_v1alpha2_jenkinsimage_cr.yaml @@ -5,16 +5,16 @@ metadata: spec: image: name: jenkins/jenkins - tag: 2.249.3-lts-alpine + tag: 2.263.1-lts-alpine plugins: - name: kubernetes - version: "1.27.6" + version: "1.28.6" - name: workflow-job version: "2.40" - name: workflow-aggregator version: "2.6" - name: git - version: "4.4.5" + version: "4.5.0" - name: job-dsl version: "1.77" - name: configuration-as-code diff --git a/deploy/operator.yaml b/deploy/operator.yaml index 967ee8ab0..95ba9a287 100644 --- a/deploy/operator.yaml +++ b/deploy/operator.yaml @@ -16,7 +16,7 @@ spec: serviceAccountName: jenkins-operator containers: - name: jenkins-operator - image: virtuslab/jenkins-operator:v0.4.0 + image: virtuslab/jenkins-operator:v0.5.0 command: - jenkins-operator args: [] diff --git a/pkg/apis/jenkins/v1alpha2/jenkins_types.go b/pkg/apis/jenkins/v1alpha2/jenkins_types.go index 8c77eee5e..61b377c90 100644 --- a/pkg/apis/jenkins/v1alpha2/jenkins_types.go +++ b/pkg/apis/jenkins/v1alpha2/jenkins_types.go @@ -351,19 +351,19 @@ type JenkinsMaster struct { // +optional // Defaults to : // - name: kubernetes - // version: 1.25.2 + // version: "1.28.6" // - name: workflow-job - // version: "2.39" + // version: "2.40" // - name: workflow-aggregator // version: "2.6" // - name: git - // version: 4.2.2 + // version: "4.5.0" // - name: job-dsl // version: "1.77" // - name: configuration-as-code - // version: "1.38" + // version: "1.46" // - name: kubernetes-credentials-provider - // version: 0.13 + // version: "0.15" BasePlugins []Plugin `json:"basePlugins,omitempty"` // Plugins contains plugins required by user diff --git a/pkg/configuration/backuprestore/backuprestore.go b/pkg/configuration/backuprestore/backuprestore.go index 68369fbd1..3805443df 100644 --- a/pkg/configuration/backuprestore/backuprestore.go +++ b/pkg/configuration/backuprestore/backuprestore.go @@ -112,6 +112,7 @@ func (bar *BackupAndRestore) Validate() []string { return messages } + // helper value indicating no saved backup const noBackup = "-1" diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go index 373071a35..abb5b5d14 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:lts" + DefaultJenkinsMasterImage = "jenkins/jenkins:2.263.2-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 811dbcb41..21b83ba67 100644 --- a/pkg/plugins/base_plugins.go +++ b/pkg/plugins/base_plugins.go @@ -2,10 +2,10 @@ package plugins const ( configurationAsCodePlugin = "configuration-as-code:1.46" - gitPlugin = "git:4.4.5" + gitPlugin = "git:4.5.0" jobDslPlugin = "job-dsl:1.77" kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:0.15" - kubernetesPlugin = "kubernetes:1.27.6" + kubernetesPlugin = "kubernetes:1.28.6" workflowAggregatorPlugin = "workflow-aggregator:2.6" workflowJobPlugin = "workflow-job:2.40" ) diff --git a/test/e2e/configuration_test.go b/test/e2e/configuration_test.go index 3dd5443c1..81a1e033d 100644 --- a/test/e2e/configuration_test.go +++ b/test/e2e/configuration_test.go @@ -138,7 +138,7 @@ func TestPlugins(t *testing.T) { i, err := job.InvokeSimple(map[string]string{}) require.NoError(t, err, i) // FIXME: waitForJobToFinish use - time.Sleep(80 * time.Second) // wait for the build to complete + time.Sleep(100 * time.Second) // wait for the build to complete job, err = jenkinsClient.GetJob(jobID) require.NoError(t, err, job)