chore: update to latest lts, update plugins, remove devbots, add devc…

…ontainer (#835) Update to the latest lts Update plugins Remove devbots Initial devcontainer config
jenkinsci · May 8, 2023 · 7bccdc2 · 7bccdc2
1 parent 5058fc2
commit 7bccdc2
Show file tree

Hide file tree

Showing 10 changed files with 59 additions and 20 deletions.
diff --git a/.devbots/needs-triage.yml b/.devbots/needs-triage.yml
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -0,0 +1,43 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/kubernetes-helm-minikube
+{
+	"name": "Kubernetes - Minikube-in-Docker",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"image": "mcr.microsoft.com/devcontainers/base:bullseye",
+
+	"features": {
+		"ghcr.io/devcontainers/features/docker-in-docker:2": {
+			"enableNonRootDocker": "true",
+			"moby": "true"
+		},
+		"ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {
+			"version": "latest",
+			"helm": "latest",
+			"minikube": "latest"
+		},
+		"ghcr.io/devcontainers/features/go:1": {
+			"version": "1.15",
+			"golangciLintVersion": "1.26.0"
+		},
+		"ghcr.io/mpriscella/features/kind:1": {
+			"version": "latest"
+		},
+		"ghcr.io/edouard-lopez/devcontainer-features/bats:0": {
+			"version": "latest"
+		}
+	}
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "kubectl version",
+
+	// Use 'postStartCommand' to run commands after the container is created like starting minikube.
+	// "postStartCommand": "nohup bash -c 'minikube start &' > minikube.log 2>&1",
+
+	// Configure tool-specific properties.
+	// "customizations": {},
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}
diff --git a/chart/jenkins-operator/README.md b/chart/jenkins-operator/README.md
@@ -1,6 +1,6 @@
 # jenkins-operator
 
-![Version: 0.6.2](https://img.shields.io/badge/Version-0.6.2-informational?style=flat-square) ![AppVersion: 0.7.1](https://img.shields.io/badge/AppVersion-0.7.1-informational?style=flat-square)
+![Version: v0.8.0-beta](https://img.shields.io/badge/Version-v0.8.0--beta-informational?style=flat-square) ![AppVersion: v0.8.0-beta](https://img.shields.io/badge/AppVersion-v0.8.0--beta-informational?style=flat-square)
 
 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.387.2-lts"` |  |
+| jenkins.image | string | `"jenkins/jenkins:2.387.3-lts"` |  |
 | jenkins.imagePullPolicy | string | `"Always"` |  |
 | jenkins.imagePullSecrets | list | `[]` |  |
 | jenkins.labels | object | `{}` |  |

diff --git a/chart/jenkins-operator/values.yaml b/chart/jenkins-operator/values.yaml
@@ -33,7 +33,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.387.2-lts
+  image: jenkins/jenkins:2.387.3-lts
 
   # env contains jenkins container environment variables
   env: []
@@ -87,13 +87,13 @@ jenkins:
   #
   # basePlugins:
   # - name: kubernetes
-  #   version: 3909.v1f2c633e8590
+  #   version: 3923.v294a_d4250b_91
   # - name: workflow-job
-  #   version: 1289.vd1c337fd5354
+  #   version: 1292.v27d8cc3e2602
   # - name: workflow-aggregator
   #   version: 596.v8c21c963d92d
   # - name: git
-  #   version: 5.0.0
+  #   version: 5.0.1
   # - name: job-dsl
   #   version: "1.83"
   # - name: configuration-as-code

diff --git a/config.base.env b/config.base.env
@@ -13,5 +13,5 @@ GEN_CRD_API=gen-crd-api-reference-docs
 IMAGE_PULL_MODE=local
 HELM_VERSION=3.1.2
 CLUSTER_DOMAIN=cluster.local
-LATEST_LTS_VERSION=2.387.2
+LATEST_LTS_VERSION=2.387.3
 KIND_CLUSTER_NAME=jenkins
diff --git a/pkg/plugins/base_plugins.go b/pkg/plugins/base_plugins.go
@@ -2,12 +2,12 @@ package plugins
 
 const (
 	configurationAsCodePlugin           = "configuration-as-code:1625.v27444588cc3d"
-	gitPlugin                           = "git:5.0.0"
+	gitPlugin                           = "git:5.0.1"
 	jobDslPlugin                        = "job-dsl:1.83"
-	kubernetesPlugin                    = "kubernetes:3909.v1f2c633e8590"
+	kubernetesPlugin                    = "kubernetes:3923.v294a_d4250b_91"
 	kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.211.vc236a_f5a_2f3c"
 	workflowAggregatorPlugin            = "workflow-aggregator:596.v8c21c963d92d"
-	workflowJobPlugin                   = "workflow-job:1289.vd1c337fd5354"
+	workflowJobPlugin                   = "workflow-job:1292.v27d8cc3e2602"
 )
 
 // basePluginsList contains plugins to install by operator.

diff --git a/test/e2e/configuration_test.go b/test/e2e/configuration_test.go
@@ -25,12 +25,12 @@ const e2e = "e2e"
 
 var expectedBasePluginsList = []plugins.Plugin{
 	plugins.Must(plugins.New("configuration-as-code:1625.v27444588cc3d")),
-	plugins.Must(plugins.New("git:5.0.0")),
-	plugins.Must(plugins.New("kubernetes:3909.v1f2c633e8590")),
+	plugins.Must(plugins.New("git:5.0.1")),
+	plugins.Must(plugins.New("kubernetes:3923.v294a_d4250b_91")),
 	plugins.Must(plugins.New("kubernetes-credentials-provider:1.211.vc236a_f5a_2f3c")),
 	plugins.Must(plugins.New("job-dsl:1.83")),
 	plugins.Must(plugins.New("workflow-aggregator:596.v8c21c963d92d")),
-	plugins.Must(plugins.New("workflow-job:1289.vd1c337fd5354")),
+	plugins.Must(plugins.New("workflow-job:1292.v27d8cc3e2602")),
 }
 
 func createUserConfigurationSecret(namespace string, stringData map[string]string) {

diff --git a/test/e2e/jenkins_test.go b/test/e2e/jenkins_test.go
@@ -244,7 +244,7 @@ func restartJenkinsMasterPod(jenkins *v1alpha2.Jenkins) {
 	Eventually(func() (bool, error) {
 		jenkinsPod = getJenkinsMasterPod(jenkins)
 		return jenkinsPod.DeletionTimestamp != nil, nil
-	}, 30*retryInterval, retryInterval).Should(BeTrue())
+	}, 45*retryInterval, retryInterval).Should(BeTrue())
 
 	_, _ = fmt.Fprintf(GinkgoWriter, "Jenkins master pod has been restarted\n")
 }

diff --git a/test/e2e/test_utility.go b/test/e2e/test_utility.go
@@ -21,7 +21,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
 )
 
-const JenkinsTestImage = "jenkins/jenkins:2.387.2-lts"
+const JenkinsTestImage = "jenkins/jenkins:2.387.3-lts"
 
 var (
 	Cfg       *rest.Config

diff --git a/test/helm/helm_test.go b/test/helm/helm_test.go
@@ -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.387.2-lts"),
+				"--set-string", fmt.Sprintf("jenkins.image=%s", "jenkins/jenkins:2.387.3-lts"),
 				"--set-string", fmt.Sprintf("operator.image=%s", *imageName), "--install")
 			output, err := cmd.CombinedOutput()
 			Expect(err).NotTo(HaveOccurred(), string(output))