Compare commits
	
		
			2 Commits
		
	
	
		
			c1b57256e0
			...
			e9564da7d7
		
	
	| Author | SHA1 | Date | 
|---|---|---|
|  | e9564da7d7 | |
|  | 08f0a74771 | 
|  | @ -36,7 +36,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.516.3-lts |   image: jenkins/jenkins:2.528.1-lts | ||||||
| 
 | 
 | ||||||
|   # env contains jenkins container environment variables |   # env contains jenkins container environment variables | ||||||
|   env: [] |   env: [] | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ GO_VERSION="1.22" | ||||||
| HELM_VERSION="3.12.3" | HELM_VERSION="3.12.3" | ||||||
| IMAGE_PULL_MODE="local" | IMAGE_PULL_MODE="local" | ||||||
| KIND_CLUSTER_NAME="jenkins" | KIND_CLUSTER_NAME="jenkins" | ||||||
| LATEST_LTS_VERSION="2.516.3" | LATEST_LTS_VERSION="2.528.1" | ||||||
| NAME="kubernetes-operator" | NAME="kubernetes-operator" | ||||||
| NAMESPACE="default" | NAMESPACE="default" | ||||||
| OPERATOR_SDK_VERSION="1.35.0" | OPERATOR_SDK_VERSION="1.35.0" | ||||||
|  |  | ||||||
|  | @ -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.516.3-lts" | 	DefaultJenkinsMasterImage = "jenkins/jenkins:2.528.1-lts" | ||||||
| 	// 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
 | ||||||
|  |  | ||||||
|  | @ -1,8 +1,8 @@ | ||||||
| package plugins | package plugins | ||||||
| 
 | 
 | ||||||
| const ( | const ( | ||||||
| 	configurationAsCodePlugin           = "configuration-as-code:1998.v3e50e6e9d9d3" | 	configurationAsCodePlugin           = "configuration-as-code:2006.v001a_2ca_6b_574" | ||||||
| 	gitPlugin                           = "git:5.7.0" | 	gitPlugin                           = "git:5.8.0" | ||||||
| 	jobDslPlugin                        = "job-dsl:1.93" | 	jobDslPlugin                        = "job-dsl:1.93" | ||||||
| 	kubernetesPlugin                    = "kubernetes:4384.v1b_6367f393d9" | 	kubernetesPlugin                    = "kubernetes:4384.v1b_6367f393d9" | ||||||
| 	kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.299.v610fa_e76761a_" | 	kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.299.v610fa_e76761a_" | ||||||
|  |  | ||||||
|  | @ -33,7 +33,7 @@ diag() { | ||||||
|     --set namespace=${DETIK_CLIENT_NAMESPACE} \ |     --set namespace=${DETIK_CLIENT_NAMESPACE} \ | ||||||
|     --set operator.image=${OPERATOR_IMAGE} \ |     --set operator.image=${OPERATOR_IMAGE} \ | ||||||
|     --set jenkins.latestPlugins=true \ |     --set jenkins.latestPlugins=true \ | ||||||
|     --set jenkins.image="jenkins/jenkins:2.516.3-lts" \ |     --set jenkins.image="jenkins/jenkins:2.528.1-lts" \ | ||||||
|     --set jenkins.imagePullPolicy="IfNotPresent" \ |     --set jenkins.imagePullPolicy="IfNotPresent" \ | ||||||
|     --set jenkins.backup.makeBackupBeforePodDeletion=false \ |     --set jenkins.backup.makeBackupBeforePodDeletion=false \ | ||||||
|     --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \ |     --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \ | ||||||
|  | @ -158,7 +158,7 @@ diag() { | ||||||
|     --set namespace=${DETIK_CLIENT_NAMESPACE} \ |     --set namespace=${DETIK_CLIENT_NAMESPACE} \ | ||||||
|     --set operator.image=${OPERATOR_IMAGE} \ |     --set operator.image=${OPERATOR_IMAGE} \ | ||||||
|     --set jenkins.latestPlugins=true \ |     --set jenkins.latestPlugins=true \ | ||||||
|     --set jenkins.image="jenkins/jenkins:2.516.3-lts" \ |     --set jenkins.image="jenkins/jenkins:2.528.1-lts" \ | ||||||
|     --set jenkins.imagePullPolicy="IfNotPresent" \ |     --set jenkins.imagePullPolicy="IfNotPresent" \ | ||||||
|     --set jenkins.backup.makeBackupBeforePodDeletion=false \ |     --set jenkins.backup.makeBackupBeforePodDeletion=false \ | ||||||
|     --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \ |     --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \ | ||||||
|  |  | ||||||
|  | @ -29,7 +29,7 @@ setup() { | ||||||
|     --set operator.image=${OPERATOR_IMAGE} \ |     --set operator.image=${OPERATOR_IMAGE} \ | ||||||
|     --set jenkins.latestPlugins=true \ |     --set jenkins.latestPlugins=true \ | ||||||
|     --set jenkins.nodeSelector.batstest=yep \ |     --set jenkins.nodeSelector.batstest=yep \ | ||||||
|     --set jenkins.image="jenkins/jenkins:2.516.3-lts" \ |     --set jenkins.image="jenkins/jenkins:2.528.1-lts" \ | ||||||
|     --set jenkins.imagePullPolicy="IfNotPresent" \ |     --set jenkins.imagePullPolicy="IfNotPresent" \ | ||||||
|     --set jenkins.backup.makeBackupBeforePodDeletion=false \ |     --set jenkins.backup.makeBackupBeforePodDeletion=false \ | ||||||
|     --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \ |     --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \ | ||||||
|  | @ -107,7 +107,7 @@ setup() { | ||||||
|     --set operator.image=${OPERATOR_IMAGE} \ |     --set operator.image=${OPERATOR_IMAGE} \ | ||||||
|     --set jenkins.latestPlugins=true \ |     --set jenkins.latestPlugins=true \ | ||||||
|     --set jenkins.nodeSelector.batstest=yep \ |     --set jenkins.nodeSelector.batstest=yep \ | ||||||
|     --set jenkins.image="jenkins/jenkins:2.516.3-lts" \ |     --set jenkins.image="jenkins/jenkins:2.528.1-lts" \ | ||||||
|     --set jenkins.imagePullPolicy="IfNotPresent" \ |     --set jenkins.imagePullPolicy="IfNotPresent" \ | ||||||
|     --set jenkins.lifecycle.preStop.exec.command="{echo bats-test}" \ |     --set jenkins.lifecycle.preStop.exec.command="{echo bats-test}" \ | ||||||
|     --set jenkins.backup.makeBackupBeforePodDeletion=false \ |     --set jenkins.backup.makeBackupBeforePodDeletion=false \ | ||||||
|  |  | ||||||
|  | @ -29,7 +29,7 @@ setup() { | ||||||
|     --set namespace=${DETIK_CLIENT_NAMESPACE} \ |     --set namespace=${DETIK_CLIENT_NAMESPACE} \ | ||||||
|     --set operator.image=${OPERATOR_IMAGE} \ |     --set operator.image=${OPERATOR_IMAGE} \ | ||||||
|     --set jenkins.latestPlugins=true \ |     --set jenkins.latestPlugins=true \ | ||||||
|     --set jenkins.image="jenkins/jenkins:2.516.3-lts" \ |     --set jenkins.image="jenkins/jenkins:2.528.1-lts" \ | ||||||
|     --set jenkins.imagePullPolicy="IfNotPresent" \ |     --set jenkins.imagePullPolicy="IfNotPresent" \ | ||||||
|     --set jenkins.backup.makeBackupBeforePodDeletion=true \ |     --set jenkins.backup.makeBackupBeforePodDeletion=true \ | ||||||
|     --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \ |     --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \ | ||||||
|  | @ -90,7 +90,7 @@ setup() { | ||||||
|     --set namespace=${DETIK_CLIENT_NAMESPACE} \ |     --set namespace=${DETIK_CLIENT_NAMESPACE} \ | ||||||
|     --set operator.image=${OPERATOR_IMAGE} \ |     --set operator.image=${OPERATOR_IMAGE} \ | ||||||
|     --set jenkins.latestPlugins=true \ |     --set jenkins.latestPlugins=true \ | ||||||
|     --set jenkins.image="jenkins/jenkins:2.516.3-lts" \ |     --set jenkins.image="jenkins/jenkins:2.528.1-lts" \ | ||||||
|     --set jenkins.imagePullPolicy="IfNotPresent" \ |     --set jenkins.imagePullPolicy="IfNotPresent" \ | ||||||
|     --set jenkins.backup.makeBackupBeforePodDeletion=true \ |     --set jenkins.backup.makeBackupBeforePodDeletion=true \ | ||||||
|     --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \ |     --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \ | ||||||
|  |  | ||||||
|  | @ -26,8 +26,8 @@ const e2e = "e2e" | ||||||
| // Plugin versions should be the same as in
 | // Plugin versions should be the same as in
 | ||||||
| // github.com/jenkinsci/kubernetes-operator/pkg/plugins/base_plugins.go
 | // github.com/jenkinsci/kubernetes-operator/pkg/plugins/base_plugins.go
 | ||||||
| const ( | const ( | ||||||
| 	configurationAsCodePlugin           = "configuration-as-code:1998.v3e50e6e9d9d3" | 	configurationAsCodePlugin           = "configuration-as-code:2006.v001a_2ca_6b_574" | ||||||
| 	gitPlugin                           = "git:5.7.0" | 	gitPlugin                           = "git:5.8.0" | ||||||
| 	jobDslPlugin                        = "job-dsl:1.93" | 	jobDslPlugin                        = "job-dsl:1.93" | ||||||
| 	kubernetesPlugin                    = "kubernetes:4384.v1b_6367f393d9" | 	kubernetesPlugin                    = "kubernetes:4384.v1b_6367f393d9" | ||||||
| 	kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.299.v610fa_e76761a_" | 	kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.299.v610fa_e76761a_" | ||||||
|  |  | ||||||
|  | @ -21,7 +21,7 @@ import ( | ||||||
| 	"sigs.k8s.io/controller-runtime/pkg/envtest" | 	"sigs.k8s.io/controller-runtime/pkg/envtest" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| const JenkinsTestImage = "jenkins/jenkins:2.516.3-lts" | const JenkinsTestImage = "jenkins/jenkins:2.528.1-lts" | ||||||
| 
 | 
 | ||||||
| var ( | var ( | ||||||
| 	Cfg       *rest.Config | 	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", | 			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.namespace=%s", namespace.Name), | ||||||
| 				"--set-string", fmt.Sprintf("jenkins.image=%s", "jenkins/jenkins:2.516.3-lts"), | 				"--set-string", fmt.Sprintf("jenkins.image=%s", "jenkins/jenkins:2.528.1-lts"), | ||||||
| 				"--set-string", fmt.Sprintf("operator.image=%s", *imageName), | 				"--set-string", fmt.Sprintf("operator.image=%s", *imageName), | ||||||
| 				"--set-string", fmt.Sprintf("backup.image=%s", "quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test"), | 				"--set-string", fmt.Sprintf("backup.image=%s", "quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test"), | ||||||
| 				"--set-string", fmt.Sprintf("jenkins.imagePullPolicy=%s", "IfNotPresent"), "--install") | 				"--set-string", fmt.Sprintf("jenkins.imagePullPolicy=%s", "IfNotPresent"), "--install") | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ | ||||||
|       "name": "website", |       "name": "website", | ||||||
|       "devDependencies": { |       "devDependencies": { | ||||||
|         "autoprefixer": "^10.4.21", |         "autoprefixer": "^10.4.21", | ||||||
|         "postcss": "^8.5.3", |         "postcss": "^8.5.6", | ||||||
|         "postcss-cli": "^11.0.1" |         "postcss-cli": "^11.0.1" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|  | @ -478,9 +478,9 @@ | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/postcss": { |     "node_modules/postcss": { | ||||||
|       "version": "8.5.3", |       "version": "8.5.6", | ||||||
|       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz", |       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz", | ||||||
|       "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==", |       "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==", | ||||||
|       "dev": true, |       "dev": true, | ||||||
|       "funding": [ |       "funding": [ | ||||||
|         { |         { | ||||||
|  | @ -498,7 +498,7 @@ | ||||||
|       ], |       ], | ||||||
|       "license": "MIT", |       "license": "MIT", | ||||||
|       "dependencies": { |       "dependencies": { | ||||||
|         "nanoid": "^3.3.8", |         "nanoid": "^3.3.11", | ||||||
|         "picocolors": "^1.1.1", |         "picocolors": "^1.1.1", | ||||||
|         "source-map-js": "^1.2.1" |         "source-map-js": "^1.2.1" | ||||||
|       }, |       }, | ||||||
|  |  | ||||||
|  | @ -5,7 +5,7 @@ | ||||||
|     }, |     }, | ||||||
|     "devDependencies": { |     "devDependencies": { | ||||||
|     "autoprefixer": "^10.4.21", |     "autoprefixer": "^10.4.21", | ||||||
|     "postcss": "^8.5.3", |     "postcss": "^8.5.6", | ||||||
|     "postcss-cli": "^11.0.1" |     "postcss-cli": "^11.0.1" | ||||||
|   } |   } | ||||||
| } | } | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue