From 76078d5ff27aea19446d77fcc0f207510f7fdeb1 Mon Sep 17 00:00:00 2001 From: Sylwia Brant Date: Wed, 8 Dec 2021 10:26:46 +0100 Subject: [PATCH] Bump version to v0.7.0 --- Makefile | 5 +- README.md | 2 +- VERSION.txt | 2 +- api/v1alpha2/jenkins_types.go | 12 ++--- config/crd/bases/jenkins.io_jenkins.yaml | 10 ++-- config/manager/manager.yaml | 3 +- .../samples/jenkins.io_v1alpha2_jenkins.yaml | 2 +- deploy/all-in-one-v1alpha2.yaml | 2 +- pkg/plugins/base_plugins.go | 8 +-- test/e2e/jenkins_configuration_test.go | 2 + test/e2e/jenkins_pod_restart_test.go | 1 + test/e2e/seedjobs_test.go | 53 ------------------- test/e2e/test_utility.go | 2 +- 13 files changed, 27 insertions(+), 77 deletions(-) diff --git a/Makefile b/Makefile index 7779d90d..e78c26be 100644 --- a/Makefile +++ b/Makefile @@ -346,7 +346,7 @@ HAS_SEMBUMP := $(shell which $(PROJECT_DIR)/bin/sembump) sembump: # Download sembump locally if necessary @echo "+ $@" ifndef HAS_SEMBUMP - mkdir bin + mkdir -p $(PROJECT_DIR)/bin wget -O $(PROJECT_DIR)/bin/sembump https://github.com/justintout/sembump/releases/download/v0.1.0/sembump-$(PLATFORM)-amd64 chmod +x $(PROJECT_DIR)/bin/sembump endif @@ -360,8 +360,9 @@ bump-version: sembump ## Bump the version in the version file. Set BUMP to [ pat echo $(NEW_VERSION) > VERSION.txt @echo "Updating version from $(VERSION) to $(NEW_VERSION) in README.md" sed -i.bak 's/$(VERSION)/$(NEW_VERSION)/g' README.md - sed -i.bak 's/$(VERSION)/$(NEW_VERSION)/g' deploy/operator.yaml + sed -i.bak 's/$(VERSION)/$(NEW_VERSION)/g' config/manager/manager.yaml sed -i.bak 's/$(VERSION)/$(NEW_VERSION)/g' deploy/$(ALL_IN_ONE_DEPLOY_FILE_PREFIX)-$(API_VERSION).yaml + rm */*/**.bak rm */**.bak rm *.bak cp config/service_account.yaml deploy/$(ALL_IN_ONE_DEPLOY_FILE_PREFIX)-$(API_VERSION).yaml diff --git a/README.md b/README.md index 23c457da..bb9731aa 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Jenkins Operator -[![Version](https://img.shields.io/badge/version-v0.6.0-brightgreen.svg)](https://github.com/jenkinsci/kubernetes-operator/releases/tag/v0.6.0) +[![Version](https://img.shields.io/badge/version-v0.7.0-brightgreen.svg)](https://github.com/jenkinsci/kubernetes-operator/releases/tag/v0.7.0) [![Build status](https://github.com/jenkinsci/kubernetes-operator/actions/workflows/auto-tests.yaml/badge.svg)](https://github.com/jenkinsci/kubernetes-operator/actions/workflows/auto-tests.yaml) [![Go Report Card](https://goreportcard.com/badge/github.com/jenkinsci/kubernetes-operator "Go Report Card")](https://goreportcard.com/report/github.com/jenkinsci/kubernetes-operator) [![Docker Pulls](https://img.shields.io/docker/pulls/virtuslab/jenkins-operator.svg)](https://hub.docker.com/r/virtuslab/jenkins-operator/tags) diff --git a/VERSION.txt b/VERSION.txt index 60f63432..8b20e485 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -v0.6.0 +v0.7.0 diff --git a/api/v1alpha2/jenkins_types.go b/api/v1alpha2/jenkins_types.go index 3de5e3e2..6134126c 100644 --- a/api/v1alpha2/jenkins_types.go +++ b/api/v1alpha2/jenkins_types.go @@ -347,19 +347,19 @@ type JenkinsMaster struct { // +optional // Defaults to : // - name: kubernetes - // version: "1.29.6" + // version: "1.30.11" // - name: workflow-job - // version: "2.41" + // version: "2.42" // - name: workflow-aggregator // version: "2.6" // - name: git - // version: "4.7.2" + // version: "4.10.0" // - name: job-dsl - // version: "1.77" + // version: "1.78.1" // - name: configuration-as-code - // version: "1.51" + // version: "1.55" // - name: kubernetes-credentials-provider - // version: "0.18-1" + // version: "0.20" BasePlugins []Plugin `json:"basePlugins,omitempty"` // Plugins contains plugins required by user diff --git a/config/crd/bases/jenkins.io_jenkins.yaml b/config/crd/bases/jenkins.io_jenkins.yaml index 8fb5afab..af8580b2 100644 --- a/config/crd/bases/jenkins.io_jenkins.yaml +++ b/config/crd/bases/jenkins.io_jenkins.yaml @@ -157,11 +157,11 @@ spec: type: object basePlugins: description: 'BasePlugins contains plugins required by operator - Defaults to : - name: kubernetes version: "1.29.6" - name: workflow-job - version: "2.41" - name: workflow-aggregator version: "2.6" - - name: git version: "4.7.2" - name: job-dsl version: "1.77" - - name: configuration-as-code version: "1.51" - name: kubernetes-credentials-provider - version: "0.18-1"' + Defaults to : - name: kubernetes version: "1.30.11" - name: + workflow-job version: "2.42" - name: workflow-aggregator version: + "2.6" - name: git version: "4.10.0" - name: job-dsl version: + "1.78.1" - name: configuration-as-code version: "1.55" - name: + kubernetes-credentials-provider version: "0.20"' items: description: Plugin defines Jenkins plugin. properties: diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 1a631d33..db5fcb00 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -3,7 +3,6 @@ apiVersion: apps/v1 kind: Deployment metadata: name: jenkins-operator - namespace: default labels: control-plane: controller-manager spec: @@ -24,7 +23,7 @@ spec: - /manager args: - --leader-elect - image: virtuslab/jenkins-operator:v0.5.0 + image: virtuslab/jenkins-operator:v0.7.0 name: jenkins-operator imagePullPolicy: IfNotPresent securityContext: diff --git a/config/samples/jenkins.io_v1alpha2_jenkins.yaml b/config/samples/jenkins.io_v1alpha2_jenkins.yaml index abed33b7..c68e6c4e 100644 --- a/config/samples/jenkins.io_v1alpha2_jenkins.yaml +++ b/config/samples/jenkins.io_v1alpha2_jenkins.yaml @@ -19,7 +19,7 @@ spec: disableCSRFProtection: false containers: - name: jenkins-master - image: jenkins/jenkins:2.303.2-lts-alpine + image: jenkins/jenkins:2.319.1-lts-alpine imagePullPolicy: Always livenessProbe: failureThreshold: 12 diff --git a/deploy/all-in-one-v1alpha2.yaml b/deploy/all-in-one-v1alpha2.yaml index 3c1eebb3..e5455530 100644 --- a/deploy/all-in-one-v1alpha2.yaml +++ b/deploy/all-in-one-v1alpha2.yaml @@ -246,7 +246,7 @@ spec: - /manager args: - --leader-elect - image: virtuslab/jenkins-operator:v0.6.0 + image: virtuslab/jenkins-operator:v0.7.0 name: jenkins-operator imagePullPolicy: IfNotPresent securityContext: diff --git a/pkg/plugins/base_plugins.go b/pkg/plugins/base_plugins.go index 3108b726..b6624be1 100644 --- a/pkg/plugins/base_plugins.go +++ b/pkg/plugins/base_plugins.go @@ -1,11 +1,11 @@ package plugins const ( - configurationAsCodePlugin = "configuration-as-code:1.54" - gitPlugin = "git:4.9.0" - jobDslPlugin = "job-dsl:1.77" + configurationAsCodePlugin = "configuration-as-code:1.55" + gitPlugin = "git:4.10.0" + jobDslPlugin = "job-dsl:1.78.1" kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:0.20" - kubernetesPlugin = "kubernetes:1.30.4" + kubernetesPlugin = "kubernetes:1.30.11" workflowAggregatorPlugin = "workflow-aggregator:2.6" workflowJobPlugin = "workflow-job:2.42" ) diff --git a/test/e2e/jenkins_configuration_test.go b/test/e2e/jenkins_configuration_test.go index 638536cb..8ce3443f 100644 --- a/test/e2e/jenkins_configuration_test.go +++ b/test/e2e/jenkins_configuration_test.go @@ -85,6 +85,7 @@ var _ = Describe("Jenkins controller configuration", func() { }) AfterEach(func() { + ShowLogsIfTestHasFailed(CurrentGinkgoTestDescription().Failed, namespace.Name) DestroyNamespace(namespace) }) @@ -185,6 +186,7 @@ var _ = Describe("Jenkins controller plugins test", func() { }) AfterEach(func() { + ShowLogsIfTestHasFailed(CurrentGinkgoTestDescription().Failed, namespace.Name) DestroyNamespace(namespace) }) diff --git a/test/e2e/jenkins_pod_restart_test.go b/test/e2e/jenkins_pod_restart_test.go index ef21e67b..f2b21264 100644 --- a/test/e2e/jenkins_pod_restart_test.go +++ b/test/e2e/jenkins_pod_restart_test.go @@ -91,6 +91,7 @@ var _ = Describe("Jenkins controller", func() { }) AfterEach(func() { + ShowLogsIfTestHasFailed(CurrentGinkgoTestDescription().Failed, namespace.Name) DestroyNamespace(namespace) }) diff --git a/test/e2e/seedjobs_test.go b/test/e2e/seedjobs_test.go index b7b2b351..dad98c2d 100644 --- a/test/e2e/seedjobs_test.go +++ b/test/e2e/seedjobs_test.go @@ -28,59 +28,6 @@ type seedJobConfig struct { PrivateKey string `json:"privateKey,omitempty"` } -/* -type seedJobsConfig struct { - SeedJobs []seedJobConfig `json:"seedJobs,omitempty"` -} - -// FIXME -func TestSeedJobs(t *testing.T) { - t.Parallel() - if seedJobConfigurationFile == nil || len(*seedJobConfigurationFile) == 0 { - t.Skipf("Skipping test because flag '%+v' is not set", seedJobConfigurationFile) - } - seedJobsConfig := loadSeedJobsConfig(t) - namespace, ctx := setupTest(t) - - defer showLogsAndCleanup(t, ctx) - - jenkinsCRName := "e2e" - var seedJobs []v1alpha2.SeedJob - - // base - for _, seedJobConfig := range seedJobsConfig.SeedJobs { - createKubernetesCredentialsProviderSecret(t, namespace, seedJobConfig) - seedJobs = append(seedJobs, seedJobConfig.SeedJob) - } - jenkins := createJenkinsCR(t, jenkinsCRName, namespace, &seedJobs, v1alpha2.GroovyScripts{}, v1alpha2.ConfigurationAsCode{}, "") - waitForJenkinsBaseConfigurationToComplete(t, jenkins) - - verifyJenkinsMasterPodAttributes(t, jenkins) - jenkinsClient, cleanUpFunc := verifyJenkinsAPIConnection(t, jenkins, namespace) - defer cleanUpFunc() - verifyPlugins(t, jenkinsClient, jenkins) - - // user - waitForJenkinsUserConfigurationToComplete(t, jenkins) - verifyJenkinsSeedJobs(t, jenkinsClient, seedJobsConfig.SeedJobs) -} - -func loadSeedJobsConfig() seedJobsConfig { - //seedJobConfigurationFile = flag.String(seedJobConfigurationParameterName, "", "path to seed job config") - jsonFile, err := os.Open(*seedJobConfigurationFile) - Expect(err).NotTo(HaveOccurred()) - defer func() { _ = jsonFile.Close() }() - - byteValue, err := ioutil.ReadAll(jsonFile) - Expect(err).NotTo(HaveOccurred()) - - var result seedJobsConfig - err = json.Unmarshal(byteValue, &result) - Expect(err).NotTo(HaveOccurred()) - Expect(result.SeedJobs).NotTo(BeEmpty()) - return result -} -*/ func createKubernetesCredentialsProviderSecret(namespace string, config seedJobConfig) { if config.JenkinsCredentialType == v1alpha2.NoJenkinsCredentialCredentialType { return diff --git a/test/e2e/test_utility.go b/test/e2e/test_utility.go index ee22d02d..949da22b 100644 --- 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.303.2-lts" +const JenkinsTestImage = "jenkins/jenkins:2.319.1-lts" var ( Cfg *rest.Config