chore: plugins and lts version october update (#1070)
This commit is contained in:
parent
bb33b8ffa0
commit
a4fa09b2ed
|
|
@ -15,20 +15,3 @@ review them:
|
||||||
- [ ] Commit messages follow [commit message best practices](https://github.com/jenkinsci/kubernetes-operator/blob/master/CONTRIBUTING.md#commit-messages)
|
- [ ] Commit messages follow [commit message best practices](https://github.com/jenkinsci/kubernetes-operator/blob/master/CONTRIBUTING.md#commit-messages)
|
||||||
|
|
||||||
_See [the contribution guide](https://github.com/jenkinsci/kubernetes-operator/blob/master/CONTRIBUTING.md) for more details._
|
_See [the contribution guide](https://github.com/jenkinsci/kubernetes-operator/blob/master/CONTRIBUTING.md) for more details._
|
||||||
|
|
||||||
|
|
||||||
## Reviewer Notes
|
|
||||||
|
|
||||||
If API changes are included, additive changes must be approved by at least two [OWNERS](https://github.com/jenkinsci/kubernetes-operator/blob/master/OWNERS) and backwards incompatible changes must be approved by [more than 50% of the OWNERS](https://github.com/jenkinsci/kubernetes-operator/blob/master/OWNERS).
|
|
||||||
|
|
||||||
# Release Notes
|
|
||||||
|
|
||||||
```
|
|
||||||
Describe any user facing changes here, or delete this block.
|
|
||||||
|
|
||||||
Examples of user facing changes:
|
|
||||||
- API changes
|
|
||||||
- Bug fixes
|
|
||||||
- Any changes in behavior
|
|
||||||
|
|
||||||
```
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
* @brokenpip3
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# jenkins-operator
|
# jenkins-operator
|
||||||
|
|
||||||
 
|
 
|
||||||
|
|
||||||
Kubernetes native operator which fully manages Jenkins on Kubernetes
|
Kubernetes native operator which fully manages Jenkins on Kubernetes
|
||||||
|
|
||||||
|
|
@ -54,7 +54,7 @@ Kubernetes native operator which fully manages Jenkins on Kubernetes
|
||||||
| jenkins.enabled | bool | `true` | |
|
| jenkins.enabled | bool | `true` | |
|
||||||
| jenkins.env | list | `[]` | |
|
| jenkins.env | list | `[]` | |
|
||||||
| jenkins.hostAliases | object | `{}` | |
|
| jenkins.hostAliases | object | `{}` | |
|
||||||
| jenkins.image | string | `"jenkins/jenkins:2.452.2-lts"` | |
|
| jenkins.image | string | `"jenkins/jenkins:2.462.3-lts"` | |
|
||||||
| jenkins.imagePullPolicy | string | `"Always"` | |
|
| jenkins.imagePullPolicy | string | `"Always"` | |
|
||||||
| jenkins.imagePullSecrets | list | `[]` | |
|
| jenkins.imagePullSecrets | list | `[]` | |
|
||||||
| jenkins.labels | object | `{}` | |
|
| jenkins.labels | object | `{}` | |
|
||||||
|
|
|
||||||
|
|
@ -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.452.2-lts
|
image: jenkins/jenkins:2.462.3-lts
|
||||||
|
|
||||||
# env contains jenkins container environment variables
|
# env contains jenkins container environment variables
|
||||||
env: []
|
env: []
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@ GO_VERSION="1.15.6"
|
||||||
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.452.2"
|
LATEST_LTS_VERSION="2.462.3"
|
||||||
NAME="kubernetes-operator"
|
NAME="kubernetes-operator"
|
||||||
NAMESPACE="default"
|
NAMESPACE="default"
|
||||||
OPERATOR_SDK_VERSION="1.3.0"
|
OPERATOR_SDK_VERSION="1.3.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.452.2-lts"
|
DefaultJenkinsMasterImage = "jenkins/jenkins:2.462.3-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,13 +1,13 @@
|
||||||
package plugins
|
package plugins
|
||||||
|
|
||||||
const (
|
const (
|
||||||
configurationAsCodePlugin = "configuration-as-code:1810.v9b_c30a_249a_4c"
|
configurationAsCodePlugin = "configuration-as-code:1850.va_a_8c31d3158b_"
|
||||||
gitPlugin = "git:5.2.2"
|
gitPlugin = "git:5.5.2"
|
||||||
jobDslPlugin = "job-dsl:1.87"
|
jobDslPlugin = "job-dsl:1.89"
|
||||||
kubernetesPlugin = "kubernetes:4246.v5a_12b_1fe120e"
|
kubernetesPlugin = "kubernetes:4295.v7fa_01b_309c95"
|
||||||
kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.262.v2670ef7ea_0c5"
|
kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.262.v2670ef7ea_0c5"
|
||||||
workflowAggregatorPlugin = "workflow-aggregator:596.v8c21c963d92d"
|
workflowAggregatorPlugin = "workflow-aggregator:600.vb_57cdd26fdd7"
|
||||||
workflowJobPlugin = "workflow-job:1400.v7fd111b_ec82f"
|
workflowJobPlugin = "workflow-job:1436.vfa_244484591f"
|
||||||
)
|
)
|
||||||
|
|
||||||
// basePluginsList contains plugins to install by operator.
|
// basePluginsList contains plugins to install by operator.
|
||||||
|
|
|
||||||
|
|
@ -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.452.2-lts" \
|
--set jenkins.image="jenkins/jenkins:2.462.3-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 \
|
||||||
|
|
@ -154,7 +154,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.452.2-lts" \
|
--set jenkins.image="jenkins/jenkins:2.462.3-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.452.2-lts" \
|
--set jenkins.image="jenkins/jenkins:2.462.3-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 \
|
||||||
|
|
@ -103,7 +103,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.452.2-lts" \
|
--set jenkins.image="jenkins/jenkins:2.462.3-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 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.452.2-lts" \
|
--set jenkins.image="jenkins/jenkins:2.462.3-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.452.2-lts" \
|
--set jenkins.image="jenkins/jenkins:2.462.3-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 \
|
||||||
|
|
|
||||||
|
|
@ -24,13 +24,13 @@ import (
|
||||||
const e2e = "e2e"
|
const e2e = "e2e"
|
||||||
|
|
||||||
var expectedBasePluginsList = []plugins.Plugin{
|
var expectedBasePluginsList = []plugins.Plugin{
|
||||||
plugins.Must(plugins.New("configuration-as-code:1810.v9b_c30a_249a_4c")),
|
plugins.Must(plugins.New("configuration-as-code:1850.va_a_8c31d3158b_")),
|
||||||
plugins.Must(plugins.New("git:5.2.2")),
|
plugins.Must(plugins.New("git:5.5.2")),
|
||||||
plugins.Must(plugins.New("kubernetes:4246.v5a_12b_1fe120e")),
|
plugins.Must(plugins.New("kubernetes:4295.v7fa_01b_309c95")),
|
||||||
plugins.Must(plugins.New("kubernetes-credentials-provider:1.262.v2670ef7ea_0c5")),
|
plugins.Must(plugins.New("kubernetes-credentials-provider:1.262.v2670ef7ea_0c5")),
|
||||||
plugins.Must(plugins.New("job-dsl:1.87")),
|
plugins.Must(plugins.New("job-dsl:1.89")),
|
||||||
plugins.Must(plugins.New("workflow-aggregator:596.v8c21c963d92d")),
|
plugins.Must(plugins.New("workflow-aggregator:600.vb_57cdd26fdd7")),
|
||||||
plugins.Must(plugins.New("workflow-job:1400.v7fd111b_ec82f")),
|
plugins.Must(plugins.New("workflow-job:1436.vfa_244484591f")),
|
||||||
}
|
}
|
||||||
|
|
||||||
func createUserConfigurationSecret(namespace string, stringData map[string]string) {
|
func createUserConfigurationSecret(namespace string, stringData map[string]string) {
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ import (
|
||||||
"sigs.k8s.io/controller-runtime/pkg/envtest"
|
"sigs.k8s.io/controller-runtime/pkg/envtest"
|
||||||
)
|
)
|
||||||
|
|
||||||
const JenkinsTestImage = "jenkins/jenkins:2.452.2-lts"
|
const JenkinsTestImage = "jenkins/jenkins:2.462.3-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.452.2-lts"),
|
"--set-string", fmt.Sprintf("jenkins.image=%s", "jenkins/jenkins:2.462.3-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")
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue