From 285718156c8ab49160f8467b8f795afacb3e38b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20S=C4=99k?= Date: Fri, 17 Jul 2020 17:17:55 +0200 Subject: [PATCH 1/3] Bump workflow-job plugin version to 2.39 --- chart/jenkins-operator/values.yaml | 24 +++++++++++++++---- deploy/crds/jenkins.io_jenkins_crd.yaml | 2 +- .../jenkins_v1alpha2_jenkinsimage_cr.yaml | 2 +- pkg/apis/jenkins/v1alpha2/jenkins_types.go | 2 +- pkg/plugins/base_plugins.go | 2 +- .../en/docs/Getting Started/latest/schema.md | 2 +- 6 files changed, 24 insertions(+), 10 deletions(-) diff --git a/chart/jenkins-operator/values.yaml b/chart/jenkins-operator/values.yaml index d59389d45..1610ae01f 100644 --- a/chart/jenkins-operator/values.yaml +++ b/chart/jenkins-operator/values.yaml @@ -73,7 +73,21 @@ jenkins: # version: "1.29" # - name: kubernetes-credentials-provider # version: 0.12.1 - basePlugins: [] + basePlugins: + - name: kubernetes + version: "1.15.7" + - name: workflow-job + version: "2.39" + - name: workflow-aggregator + version: "2.6" + - name: git + version: "3.10.0" + - name: job-dsl + version: "1.74" + - name: configuration-as-code + version: "1.19" + - name: kubernetes-credentials-provider + version: "0.12.1" # plugins are plugins required by the user # You can define plugins here @@ -197,11 +211,11 @@ jenkins: # See https://jenkinsci.github.io/kubernetes-operator/docs/getting-started/latest/customization/ for details configuration: configurationAsCode: {} -# - configMapName: jenkins-casc -# content: {} + # - configMapName: jenkins-casc + # content: {} groovyScripts: {} -# - configMapName: jenkins-gs -# content: {} + # - configMapName: jenkins-gs + # content: {} # secretRefName of existing secret (previously created) secretRefName: "" diff --git a/deploy/crds/jenkins.io_jenkins_crd.yaml b/deploy/crds/jenkins.io_jenkins_crd.yaml index 7ccfd5298..1d4e96c45 100644 --- a/deploy/crds/jenkins.io_jenkins_crd.yaml +++ b/deploy/crds/jenkins.io_jenkins_crd.yaml @@ -152,7 +152,7 @@ spec: basePlugins: description: 'BasePlugins contains plugins required by operator Defaults to : - name: kubernetes version: 1.15.7 - name: workflow-job - version: "2.32" - name: workflow-aggregator version: "2.6" - name: + version: "2.39" - name: workflow-aggregator version: "2.6" - name: git version: 3.10.0 - name: job-dsl version: "1.74" - name: configuration-as-code version: "1.19" - name: kubernetes-credentials-provider version: 0.12.1' items: diff --git a/deploy/crds/jenkins_v1alpha2_jenkinsimage_cr.yaml b/deploy/crds/jenkins_v1alpha2_jenkinsimage_cr.yaml index f767a2546..9bf8eb2c9 100644 --- a/deploy/crds/jenkins_v1alpha2_jenkinsimage_cr.yaml +++ b/deploy/crds/jenkins_v1alpha2_jenkinsimage_cr.yaml @@ -10,7 +10,7 @@ spec: - name: kubernetes version: "1.15.7" - name: workflow-job - version: "2.32" + version: "2.39" - name: workflow-aggregator version: "2.6" - name: git diff --git a/pkg/apis/jenkins/v1alpha2/jenkins_types.go b/pkg/apis/jenkins/v1alpha2/jenkins_types.go index 169029918..395cf2117 100644 --- a/pkg/apis/jenkins/v1alpha2/jenkins_types.go +++ b/pkg/apis/jenkins/v1alpha2/jenkins_types.go @@ -353,7 +353,7 @@ type JenkinsMaster struct { // - name: kubernetes // version: 1.15.7 // - name: workflow-job - // version: "2.32" + // version: "2.39" // - name: workflow-aggregator // version: "2.6" // - name: git diff --git a/pkg/plugins/base_plugins.go b/pkg/plugins/base_plugins.go index 89414321f..e7feb4bd5 100644 --- a/pkg/plugins/base_plugins.go +++ b/pkg/plugins/base_plugins.go @@ -7,7 +7,7 @@ const ( kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:0.13" kubernetesPlugin = "kubernetes:1.25.2" workflowAggregatorPlugin = "workflow-aggregator:2.6" - workflowJobPlugin = "workflow-job:2.38" + workflowJobPlugin = "workflow-job:2.39" ) // basePluginsList contains plugins to install by operator. diff --git a/website/content/en/docs/Getting Started/latest/schema.md b/website/content/en/docs/Getting Started/latest/schema.md index 36a064e6c..cdb01bff6 100644 --- a/website/content/en/docs/Getting Started/latest/schema.md +++ b/website/content/en/docs/Getting Started/latest/schema.md @@ -1083,7 +1083,7 @@ Defaults to : - name: kubernetes version: 1.15.7 - name: workflow-job -version: “2.32” +version: “2.39” - name: workflow-aggregator version: “2.6” - name: git From 5beff3b59a0a73581e0e58752015b1218a088a41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20S=C4=99k?= Date: Sun, 19 Jul 2020 17:25:57 +0200 Subject: [PATCH 2/3] Bump workflow-job plugin version to 2.39 --- chart/jenkins-operator/values.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/chart/jenkins-operator/values.yaml b/chart/jenkins-operator/values.yaml index 1610ae01f..f6a5cceae 100644 --- a/chart/jenkins-operator/values.yaml +++ b/chart/jenkins-operator/values.yaml @@ -75,19 +75,19 @@ jenkins: # version: 0.12.1 basePlugins: - name: kubernetes - version: "1.15.7" + version: "1.25.2" - name: workflow-job version: "2.39" - name: workflow-aggregator version: "2.6" - name: git - version: "3.10.0" + version: "4.2.2" - name: job-dsl - version: "1.74" + version: "1.77" - name: configuration-as-code - version: "1.19" + version: "1.38" - name: kubernetes-credentials-provider - version: "0.12.1" + version: "0.13" # plugins are plugins required by the user # You can define plugins here From ac91e5f19b6da37436b96e18c41b07ac81daef22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20S=C4=99k?= Date: Sun, 19 Jul 2020 17:29:08 +0200 Subject: [PATCH 3/3] Release 0.3.4 Helm chart --- chart/index.yaml | 10 ++++++++++ chart/jenkins-operator/Chart.yaml | 2 +- .../jenkins-operator/jenkins-operator-0.3.4.tgz | Bin 0 -> 5754 bytes 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 chart/jenkins-operator/jenkins-operator-0.3.4.tgz diff --git a/chart/index.yaml b/chart/index.yaml index 267873a84..fa33253ce 100644 --- a/chart/index.yaml +++ b/chart/index.yaml @@ -1,6 +1,16 @@ apiVersion: v1 entries: jenkins-operator: + - apiVersion: v2 + appVersion: 0.4.0 + created: "2020-07-19T17:26:48.811339047+02:00" + description: Kubernetes native operator which fully manages Jenkins on Kubernetes + digest: edbeeef69b7ff17d1f63f5b1bffe45c4cd5b8aa2bb329e828232d6d05fc5f1b7 + icon: https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/assets/jenkins-operator-icon.png + name: jenkins-operator + urls: + - https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/chart/jenkins-operator/jenkins-operator-0.3.4.tgz + version: 0.3.4 - apiVersion: v2 appVersion: 0.4.0 created: "2020-06-18T11:48:46.186259+02:00" diff --git a/chart/jenkins-operator/Chart.yaml b/chart/jenkins-operator/Chart.yaml index b27c6b3f8..9efe98d8b 100644 --- a/chart/jenkins-operator/Chart.yaml +++ b/chart/jenkins-operator/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 appVersion: "0.4.0" description: Kubernetes native operator which fully manages Jenkins on Kubernetes name: jenkins-operator -version: 0.3.3 +version: 0.3.4 icon: https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/assets/jenkins-operator-icon.png diff --git a/chart/jenkins-operator/jenkins-operator-0.3.4.tgz b/chart/jenkins-operator/jenkins-operator-0.3.4.tgz new file mode 100644 index 0000000000000000000000000000000000000000..0c7571476ea03559e25b8ee6c7765cd57e68daf7 GIT binary patch literal 5754 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