Bump version to v0.5.0
This commit is contained in:
		
							parent
							
								
									8a1c5eeb56
								
							
						
					
					
						commit
						fe81e5ab3d
					
				|  | @ -1,6 +1,6 @@ | ||||||
| # Jenkins Operator | # Jenkins Operator | ||||||
| 
 | 
 | ||||||
| [](https://github.com/jenkinsci/kubernetes-operator/releases/tag/v0.4.0) | [](https://github.com/jenkinsci/kubernetes-operator/releases/tag/v0.5.0) | ||||||
| [](https://travis-ci.org/jenkinsci/kubernetes-operator) | [](https://travis-ci.org/jenkinsci/kubernetes-operator) | ||||||
| [](https://goreportcard.com/report/github.com/jenkinsci/kubernetes-operator) | [](https://goreportcard.com/report/github.com/jenkinsci/kubernetes-operator) | ||||||
| [](https://hub.docker.com/r/virtuslab/jenkins-operator/tags) | [](https://hub.docker.com/r/virtuslab/jenkins-operator/tags) | ||||||
|  |  | ||||||
|  | @ -1 +1 @@ | ||||||
| v0.4.0 | v0.5.0 | ||||||
|  |  | ||||||
|  | @ -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.249.3-lts-alpine |   image: jenkins/jenkins:2.263.2-lts-alpine | ||||||
| 
 | 
 | ||||||
|   # env contains jenkins container environment variables |   # env contains jenkins container environment variables | ||||||
|   env: [] |   env: [] | ||||||
|  | @ -63,13 +63,13 @@ jenkins: | ||||||
|   # |   # | ||||||
|   # basePlugins: |   # basePlugins: | ||||||
|   # - name: kubernetes |   # - name: kubernetes | ||||||
|   #   version: 1.27.6 |   #   version: 1.28.6 | ||||||
|   # - 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.4.5 |   #   version: 4.5.0 | ||||||
|   # - name: job-dsl |   # - name: job-dsl | ||||||
|   #   version: "1.77" |   #   version: "1.77" | ||||||
|   # - name: configuration-as-code |   # - name: configuration-as-code | ||||||
|  | @ -78,13 +78,13 @@ jenkins: | ||||||
|   #   version: 0.15 |   #   version: 0.15 | ||||||
|   basePlugins: |   basePlugins: | ||||||
|     - name: kubernetes |     - name: kubernetes | ||||||
|       version: "1.27.6" |       version: "1.28.6" | ||||||
|     - 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.4.5" |       version: "4.5.0" | ||||||
|     - name: job-dsl |     - name: job-dsl | ||||||
|       version: "1.77" |       version: "1.77" | ||||||
|     - name: configuration-as-code |     - name: configuration-as-code | ||||||
|  |  | ||||||
|  | @ -93,6 +93,16 @@ rules: | ||||||
|       - get |       - get | ||||||
|       - list |       - list | ||||||
|       - watch |       - watch | ||||||
|  |   - apiGroups: | ||||||
|  |       - "route.openshift.io" | ||||||
|  |     resources: | ||||||
|  |       - routes | ||||||
|  |     verbs: | ||||||
|  |       - get | ||||||
|  |       - list | ||||||
|  |       - watch | ||||||
|  |       - create  | ||||||
|  |       - update | ||||||
|   - apiGroups: |   - apiGroups: | ||||||
|       - "image.openshift.io" |       - "image.openshift.io" | ||||||
|     resources: |     resources: | ||||||
|  | @ -140,7 +150,7 @@ spec: | ||||||
|       serviceAccountName: jenkins-operator |       serviceAccountName: jenkins-operator | ||||||
|       containers: |       containers: | ||||||
|         - name: jenkins-operator |         - name: jenkins-operator | ||||||
|           image: virtuslab/jenkins-operator:v0.4.0 |           image: virtuslab/jenkins-operator:v0.5.0 | ||||||
|           command: |           command: | ||||||
|           - jenkins-operator |           - jenkins-operator | ||||||
|           args: [] |           args: [] | ||||||
|  |  | ||||||
|  | @ -6,35 +6,7 @@ spec: | ||||||
|   master: |   master: | ||||||
|     containers: |     containers: | ||||||
|     - name: jenkins-master |     - name: jenkins-master | ||||||
|       image: jenkins/jenkins:2.249.3-lts-alpine |       image: jenkins/jenkins:2.263.2-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 |  | ||||||
|   seedJobs: |   seedJobs: | ||||||
|   - id: jenkins-operator |   - id: jenkins-operator | ||||||
|     targets: "cicd/jobs/*.jenkins" |     targets: "cicd/jobs/*.jenkins" | ||||||
|  |  | ||||||
|  | @ -5,16 +5,16 @@ metadata: | ||||||
| spec: | spec: | ||||||
|   image: |   image: | ||||||
|     name: jenkins/jenkins |     name: jenkins/jenkins | ||||||
|     tag: 2.249.3-lts-alpine |     tag: 2.263.1-lts-alpine | ||||||
|   plugins: |   plugins: | ||||||
|   - name: kubernetes |   - name: kubernetes | ||||||
|     version: "1.27.6" |     version: "1.28.6" | ||||||
|   - 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.4.5" |     version: "4.5.0" | ||||||
|   - name: job-dsl |   - name: job-dsl | ||||||
|     version: "1.77" |     version: "1.77" | ||||||
|   - name: configuration-as-code |   - name: configuration-as-code | ||||||
|  |  | ||||||
|  | @ -16,7 +16,7 @@ spec: | ||||||
|       serviceAccountName: jenkins-operator |       serviceAccountName: jenkins-operator | ||||||
|       containers: |       containers: | ||||||
|         - name: jenkins-operator |         - name: jenkins-operator | ||||||
|           image: virtuslab/jenkins-operator:v0.4.0 |           image: virtuslab/jenkins-operator:v0.5.0 | ||||||
|           command: |           command: | ||||||
|           - jenkins-operator |           - jenkins-operator | ||||||
|           args: [] |           args: [] | ||||||
|  |  | ||||||
|  | @ -351,19 +351,19 @@ type JenkinsMaster struct { | ||||||
| 	// +optional
 | 	// +optional
 | ||||||
| 	// Defaults to :
 | 	// Defaults to :
 | ||||||
| 	// - name: kubernetes
 | 	// - name: kubernetes
 | ||||||
| 	// version: 1.25.2
 | 	// version: "1.28.6"
 | ||||||
| 	// - name: workflow-job
 | 	// - name: workflow-job
 | ||||||
| 	// version: "2.39"
 | 	// version: "2.40"
 | ||||||
| 	// - name: workflow-aggregator
 | 	// - name: workflow-aggregator
 | ||||||
| 	// version: "2.6"
 | 	// version: "2.6"
 | ||||||
| 	// - name: git
 | 	// - name: git
 | ||||||
| 	// version: 4.2.2
 | 	// version: "4.5.0"
 | ||||||
| 	// - name: job-dsl
 | 	// - name: job-dsl
 | ||||||
| 	// version: "1.77"
 | 	// version: "1.77"
 | ||||||
| 	// - name: configuration-as-code
 | 	// - name: configuration-as-code
 | ||||||
| 	// version: "1.38"
 | 	// version: "1.46"
 | ||||||
| 	// - name: kubernetes-credentials-provider
 | 	// - name: kubernetes-credentials-provider
 | ||||||
| 	// version: 0.13
 | 	// version: "0.15"
 | ||||||
| 	BasePlugins []Plugin `json:"basePlugins,omitempty"` | 	BasePlugins []Plugin `json:"basePlugins,omitempty"` | ||||||
| 
 | 
 | ||||||
| 	// Plugins contains plugins required by user
 | 	// Plugins contains plugins required by user
 | ||||||
|  |  | ||||||
|  | @ -112,6 +112,7 @@ func (bar *BackupAndRestore) Validate() []string { | ||||||
| 
 | 
 | ||||||
| 	return messages | 	return messages | ||||||
| } | } | ||||||
|  | 
 | ||||||
| // helper value indicating no saved backup
 | // helper value indicating no saved backup
 | ||||||
| const noBackup = "-1" | const noBackup = "-1" | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -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:lts" | 	DefaultJenkinsMasterImage = "jenkins/jenkins:2.263.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
 | ||||||
|  |  | ||||||
|  | @ -2,10 +2,10 @@ package plugins | ||||||
| 
 | 
 | ||||||
| const ( | const ( | ||||||
| 	configurationAsCodePlugin           = "configuration-as-code:1.46" | 	configurationAsCodePlugin           = "configuration-as-code:1.46" | ||||||
| 	gitPlugin                           = "git:4.4.5" | 	gitPlugin                           = "git:4.5.0" | ||||||
| 	jobDslPlugin                        = "job-dsl:1.77" | 	jobDslPlugin                        = "job-dsl:1.77" | ||||||
| 	kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:0.15" | 	kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:0.15" | ||||||
| 	kubernetesPlugin                    = "kubernetes:1.27.6" | 	kubernetesPlugin                    = "kubernetes:1.28.6" | ||||||
| 	workflowAggregatorPlugin            = "workflow-aggregator:2.6" | 	workflowAggregatorPlugin            = "workflow-aggregator:2.6" | ||||||
| 	workflowJobPlugin                   = "workflow-job:2.40" | 	workflowJobPlugin                   = "workflow-job:2.40" | ||||||
| ) | ) | ||||||
|  |  | ||||||
|  | @ -138,7 +138,7 @@ func TestPlugins(t *testing.T) { | ||||||
| 	i, err := job.InvokeSimple(map[string]string{}) | 	i, err := job.InvokeSimple(map[string]string{}) | ||||||
| 	require.NoError(t, err, i) | 	require.NoError(t, err, i) | ||||||
| 	// FIXME: waitForJobToFinish use
 | 	// 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) | 	job, err = jenkinsClient.GetJob(jobID) | ||||||
| 	require.NoError(t, err, job) | 	require.NoError(t, err, job) | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue