diff --git a/chart/index.yaml b/chart/index.yaml index 267873a8..fa33253c 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 b27c6b3f..9efe98d8 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 00000000..0c757147 Binary files /dev/null and b/chart/jenkins-operator/jenkins-operator-0.3.4.tgz differ diff --git a/chart/jenkins-operator/values.yaml b/chart/jenkins-operator/values.yaml index d59389d4..f6a5ccea 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.25.2" + - name: workflow-job + version: "2.39" + - name: workflow-aggregator + version: "2.6" + - name: git + version: "4.2.2" + - name: job-dsl + version: "1.77" + - name: configuration-as-code + version: "1.38" + - name: kubernetes-credentials-provider + version: "0.13" # 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 7ccfd529..1d4e96c4 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 f767a254..9bf8eb2c 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 16902991..395cf211 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 89414321..e7feb4bd 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 36a064e6..cdb01bff 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