chore(jenkins): update latest lts and plugins version (#900)
This commit is contained in:
		
							parent
							
								
									1b6e944ae6
								
							
						
					
					
						commit
						2c88fe13a8
					
				|  | @ -1,6 +1,6 @@ | |||
| # Jenkins Operator | ||||
| 
 | ||||
| [](https://github.com/jenkinsci/kubernetes-operator/releases/tag/v0.8.0-beta2) | ||||
| [](https://github.com/jenkinsci/kubernetes-operator/releases/tag/v0.8.0) | ||||
| [](https://github.com/jenkinsci/kubernetes-operator/actions/workflows/auto-tests-e2e.yaml) | ||||
| [](https://goreportcard.com/report/github.com/jenkinsci/kubernetes-operator) | ||||
| [](https://gitter.im/jenkinsci/kubernetes-operator) | ||||
|  |  | |||
|  | @ -1,6 +1,6 @@ | |||
| # jenkins-operator | ||||
| 
 | ||||
|   | ||||
|   | ||||
| 
 | ||||
| Kubernetes native operator which fully manages Jenkins on Kubernetes | ||||
| 
 | ||||
|  | @ -52,7 +52,7 @@ Kubernetes native operator which fully manages Jenkins on Kubernetes | |||
| | jenkins.enabled | bool | `true` |  | | ||||
| | jenkins.env | list | `[]` |  | | ||||
| | jenkins.hostAliases | object | `{}` |  | | ||||
| | jenkins.image | string | `"jenkins/jenkins:2.401.1-lts"` |  | | ||||
| | jenkins.image | string | `"jenkins/jenkins:2.414.1-lts"` |  | | ||||
| | jenkins.imagePullPolicy | string | `"Always"` |  | | ||||
| | jenkins.imagePullSecrets | list | `[]` |  | | ||||
| | jenkins.labels | object | `{}` |  | | ||||
|  | @ -95,7 +95,7 @@ Kubernetes native operator which fully manages Jenkins on Kubernetes | |||
| | jenkins.volumes[0].persistentVolumeClaim.claimName | string | `"jenkins-backup"` |  | | ||||
| | operator.affinity | object | `{}` |  | | ||||
| | operator.fullnameOverride | string | `""` |  | | ||||
| | operator.image | string | `"quay.io/jenkins-kubernetes-operator/operator:v0.8.0-beta2"` |  | | ||||
| | operator.image | string | `"quay.io/jenkins-kubernetes-operator/operator:v0.8.0"` |  | | ||||
| | operator.imagePullPolicy | string | `"IfNotPresent"` |  | | ||||
| | operator.imagePullSecrets | list | `[]` |  | | ||||
| | operator.nameOverride | string | `""` |  | | ||||
|  |  | |||
|  | @ -36,7 +36,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.401.1-lts | ||||
|   image: jenkins/jenkins:2.414.1-lts | ||||
| 
 | ||||
|   # env contains jenkins container environment variables | ||||
|   env: [] | ||||
|  | @ -90,19 +90,19 @@ jenkins: | |||
|   # | ||||
|   # basePlugins: | ||||
|   # - name: kubernetes | ||||
|   #   version: 3937.vd7b_82db_e347b_ | ||||
|   #   version: 4029.v5712230ccb_f8 | ||||
|   # - name: workflow-job | ||||
|   #   version: 1308.v58d48a_763b_31 | ||||
|   #   version: 1342.v046651d5b_dfe | ||||
|   # - name: workflow-aggregator | ||||
|   #   version: 596.v8c21c963d92d | ||||
|   # - name: git | ||||
|   #   version: 5.0.2 | ||||
|   #   version: 5.2.0 | ||||
|   # - name: job-dsl | ||||
|   #   version: "1.84" | ||||
|   #   version: "1.85" | ||||
|   # - name: configuration-as-code | ||||
|   #   version: 1647.ve39ca_b_829b_42 | ||||
|   # - name: kubernetes-credentials-provider | ||||
|   #   version: 1.211.vc236a_f5a_2f3c | ||||
|   #   version: 1.234.vf3013b_35f5b_a | ||||
| 
 | ||||
|   basePlugins: [] | ||||
| 
 | ||||
|  | @ -294,7 +294,7 @@ operator: | |||
|   replicaCount: 1 | ||||
| 
 | ||||
|   # image is the name (and tag) of the Jenkins Operator image | ||||
|   image: quay.io/jenkins-kubernetes-operator/operator:v0.8.0-beta2 | ||||
|   image: quay.io/jenkins-kubernetes-operator/operator:v0.8.0 | ||||
| 
 | ||||
|   # imagePullPolicy defines policy for pulling images | ||||
|   imagePullPolicy: IfNotPresent | ||||
|  |  | |||
|  | @ -11,7 +11,7 @@ API_VERSION_NEXT=v1alpha3 | |||
| ALL_IN_ONE_DEPLOY_FILE_PREFIX=all-in-one | ||||
| GEN_CRD_API=gen-crd-api-reference-docs | ||||
| IMAGE_PULL_MODE=local | ||||
| HELM_VERSION=3.12.1 | ||||
| HELM_VERSION=3.12.3 | ||||
| CLUSTER_DOMAIN=cluster.local | ||||
| LATEST_LTS_VERSION=2.401.1 | ||||
| LATEST_LTS_VERSION=2.414.1 | ||||
| KIND_CLUSTER_NAME=jenkins | ||||
|  |  | |||
|  | @ -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.401.1-lts" | ||||
| 	DefaultJenkinsMasterImage = "jenkins/jenkins:2.414.1-lts" | ||||
| 	// DefaultHTTPPortInt32 is the default Jenkins HTTP port
 | ||||
| 	DefaultHTTPPortInt32 = int32(8080) | ||||
| 	// DefaultSlavePortInt32 is the default Jenkins port for slaves
 | ||||
|  |  | |||
|  | @ -1,13 +1,13 @@ | |||
| package plugins | ||||
| 
 | ||||
| const ( | ||||
| 	configurationAsCodePlugin           = "configuration-as-code:1647.ve39ca_b_829b_42" | ||||
| 	gitPlugin                           = "git:5.1.0" | ||||
| 	jobDslPlugin                        = "job-dsl:1.84" | ||||
| 	kubernetesPlugin                    = "kubernetes:3952.v88e3b_0cf300b_" | ||||
| 	kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.225.v14f9e6b_28f53" | ||||
| 	configurationAsCodePlugin           = "configuration-as-code:1700.v6f448841296e" | ||||
| 	gitPlugin                           = "git:5.2.0" | ||||
| 	jobDslPlugin                        = "job-dsl:1.85" | ||||
| 	kubernetesPlugin                    = "kubernetes:4029.v5712230ccb_f8" | ||||
| 	kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.234.vf3013b_35f5b_a" | ||||
| 	workflowAggregatorPlugin            = "workflow-aggregator:596.v8c21c963d92d" | ||||
| 	workflowJobPlugin                   = "workflow-job:1308.v58d48a_763b_31" | ||||
| 	workflowJobPlugin                   = "workflow-job:1342.v046651d5b_dfe" | ||||
| ) | ||||
| 
 | ||||
| // basePluginsList contains plugins to install by operator.
 | ||||
|  |  | |||
|  | @ -24,13 +24,13 @@ import ( | |||
| const e2e = "e2e" | ||||
| 
 | ||||
| var expectedBasePluginsList = []plugins.Plugin{ | ||||
| 	plugins.Must(plugins.New("configuration-as-code:1647.ve39ca_b_829b_42")), | ||||
| 	plugins.Must(plugins.New("git:5.1.0")), | ||||
| 	plugins.Must(plugins.New("kubernetes:3952.v88e3b_0cf300b_")), | ||||
| 	plugins.Must(plugins.New("kubernetes-credentials-provider:1.225.v14f9e6b_28f53")), | ||||
| 	plugins.Must(plugins.New("job-dsl:1.84")), | ||||
| 	plugins.Must(plugins.New("configuration-as-code:1700.v6f448841296e")), | ||||
| 	plugins.Must(plugins.New("git:5.2.0")), | ||||
| 	plugins.Must(plugins.New("kubernetes:4029.v5712230ccb_f8")), | ||||
| 	plugins.Must(plugins.New("kubernetes-credentials-provider:1.234.vf3013b_35f5b_a")), | ||||
| 	plugins.Must(plugins.New("job-dsl:1.85")), | ||||
| 	plugins.Must(plugins.New("workflow-aggregator:596.v8c21c963d92d")), | ||||
| 	plugins.Must(plugins.New("workflow-job:1308.v58d48a_763b_31")), | ||||
| 	plugins.Must(plugins.New("workflow-job:1342.v046651d5b_dfe")), | ||||
| } | ||||
| 
 | ||||
| func createUserConfigurationSecret(namespace string, stringData map[string]string) { | ||||
|  |  | |||
|  | @ -21,7 +21,7 @@ import ( | |||
| 	"sigs.k8s.io/controller-runtime/pkg/envtest" | ||||
| ) | ||||
| 
 | ||||
| const JenkinsTestImage = "jenkins/jenkins:2.401.1-lts" | ||||
| const JenkinsTestImage = "jenkins/jenkins:2.414.1-lts" | ||||
| 
 | ||||
| var ( | ||||
| 	Cfg       *rest.Config | ||||
|  |  | |||
|  | @ -47,7 +47,7 @@ var _ = Describe("Jenkins Controller", func() { | |||
| 
 | ||||
| 			cmd := exec.Command("../../bin/helm", "upgrade", "jenkins", "../../chart/jenkins-operator", "--namespace", namespace.Name, "--debug", | ||||
| 				"--set-string", fmt.Sprintf("jenkins.namespace=%s", namespace.Name), | ||||
| 				"--set-string", fmt.Sprintf("jenkins.image=%s", "jenkins/jenkins:2.401.1-lts"), | ||||
| 				"--set-string", fmt.Sprintf("jenkins.image=%s", "jenkins/jenkins:2.414.1-lts"), | ||||
| 				"--set-string", fmt.Sprintf("operator.image=%s", *imageName), "--install") | ||||
| 			output, err := cmd.CombinedOutput() | ||||
| 			Expect(err).NotTo(HaveOccurred(), string(output)) | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue