From 4aa34157c377a76a9ba3ec7098ee3f3737408ccf Mon Sep 17 00:00:00 2001 From: Mateusz Korus Date: Tue, 10 Aug 2021 09:58:24 +0200 Subject: [PATCH] Merge master (#620) * Fix workflow for autogenerating docs (#592) * Use grep -c flag in check for changes step to fix case when more than 1 website file was modified * Configure bot for labelling new issues as needing triage (#597) * Configure bot for managing stale issues (#598) * Docs: explanation what is backed up and why (#599) * Explanation what's backed up and why * Auto-updated docs (#600) Co-authored-by: prryb * Docs: clarification of description of get latest command in backup (#601) * Auto-updated docs (#602) Co-authored-by: Sig00rd * Bump seedjobs agent image version to 4.9-1 (#604) * Add GitLFS pull after checkout behaviour to SeedJob GroovyScript Template (#483) Add GitLFS pull after checkout behaviour to support also repositories which are relying on Git LFS Close #482 * Docs: minor fixes (#608) * Link to project's DockerHub in README's section on nightly builds, add paragraph about nightly builds in installation docs * Fix repositoryURL in sample seedJob configuration with SSH auth * Slightly expand on #348 * Fix formatting in docs on Jenkins' customization, update plugin versions * Add notes on Jenkins home Volume in Helm chart values.yaml and docs (#589) * Auto-updated docs (#610) Co-authored-by: Sig00rd * Add an issue template for documentation (#613) * Docs: add info on restricted volumeMounts other than jenkins-home(#612) * Update note in installation docs * Update Helm chart default values.yaml * Update schema * Auto-updated docs (#616) Co-authored-by: Sig00rd * Auto-updated docs (#617) Co-authored-by: Sig00rd * Helm Chart: Remove empty priorityClassName from Jenkins template (#618) Also bump Helm Chart version to v0.5.2 * Fix bad identation in chart/index.yaml (#619) Co-authored-by: Szymon Fugas Co-authored-by: Piotr Ryba <55996264+prryb@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: prryb Co-authored-by: Sig00rd Co-authored-by: Cosnita Radu Viorel Co-authored-by: Morten Birkelund Co-authored-by: Ernestas --- chart/index.yaml | 10 ++ docs/docs/developer-guide/index.html | 154 +++++++++--------- .../configuring-backup-and-restore/index.html | 132 +++++++-------- .../Getting Started/v0.5.x/configuration.md | 2 +- .../Getting Started/v0.5.x/customization.md | 21 +-- 5 files changed, 165 insertions(+), 154 deletions(-) diff --git a/chart/index.yaml b/chart/index.yaml index 98401d0b..f8bad344 100644 --- a/chart/index.yaml +++ b/chart/index.yaml @@ -21,6 +21,16 @@ entries: urls: - https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/chart/jenkins-operator/jenkins-operator-0.5.2.tgz version: 0.5.2 + - apiVersion: v2 + appVersion: 0.6.0 + created: "2021-06-11T13:50:32.677639006+02:00" + description: Kubernetes native operator which fully manages Jenkins on Kubernetes + digest: 48fbf15c3ffff7003623edcde0bec39dc37d0a62303f08066960d5fac799af90 + 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.5.2.tgz + version: 0.5.2 - apiVersion: v2 appVersion: 0.6.0 created: "2021-06-11T13:50:32.677639006+02:00" diff --git a/docs/docs/developer-guide/index.html b/docs/docs/developer-guide/index.html index c87340d6..208bf335 100644 --- a/docs/docs/developer-guide/index.html +++ b/docs/docs/developer-guide/index.html @@ -225,23 +225,23 @@ Security - - - - - + + + + + AKS - - - - - + + + + + OpenShift - + Schema @@ -493,7 +493,7 @@ Schema - + @@ -577,8 +577,8 @@ - - + + @@ -591,63 +591,63 @@ - - + + @@ -704,10 +704,10 @@ - - - - + + + + @@ -720,9 +720,9 @@
  • - - - + + +
@@ -1175,16 +1175,16 @@ kubectl get secret jenkins-operator-credentials-<cr_name> -o
Tools @@ -1215,7 +1215,7 @@ kubectl get secret jenkins-operator-credentials-<cr_name> -o Security - - - - - + + + + + AKS - - - - - + + + + + OpenShift - + Schema @@ -500,7 +500,7 @@ Schema - + @@ -584,8 +584,8 @@ - - + + @@ -598,63 +598,63 @@ - - + + @@ -711,10 +711,10 @@ - - - - + + + + @@ -727,9 +727,9 @@
  • - - - + + +
diff --git a/website/content/en/docs/Getting Started/v0.5.x/configuration.md b/website/content/en/docs/Getting Started/v0.5.x/configuration.md index 439a0de8..29d44e60 100644 --- a/website/content/en/docs/Getting Started/v0.5.x/configuration.md +++ b/website/content/en/docs/Getting Started/v0.5.x/configuration.md @@ -163,7 +163,7 @@ spec: targets: "cicd/jobs/*.jenkins" description: "Jenkins Operator repository" repositoryBranch: master - repositoryUrl: ssh://git@github.com:jenkinsci/kubernetes-operator.git + repositoryUrl: git@github.com:jenkinsci/kubernetes-operator.git ``` and create a Kubernetes Secret (name of secret should be the same from `credentialID` field): diff --git a/website/content/en/docs/Getting Started/v0.5.x/customization.md b/website/content/en/docs/Getting Started/v0.5.x/customization.md index 1cc93540..167c556f 100644 --- a/website/content/en/docs/Getting Started/v0.5.x/customization.md +++ b/website/content/en/docs/Getting Started/v0.5.x/customization.md @@ -13,13 +13,14 @@ Plugin's configuration is applied as groovy scripts or the [configuration as cod Any plugin working for Jenkins can be installed by the Jenkins Operator. Pre-installed plugins: -* configuration-as-code v1.47 -* git v4.5.0 + +* configuration-as-code v1.51 +* git v4.7.2 * job-dsl v1.77 -* kubernetes-credentials-provider v0.15 -* kubernetes v1.29.2 +* kubernetes-credentials-provider v0.18-1 +* kubernetes v1.30.0 * workflow-aggregator v2.6 -* workflow-job v2.40 +* workflow-job v2.41 Rest of the plugins can be found in [plugins repository](https://plugins.jenkins.io/). @@ -28,7 +29,7 @@ Rest of the plugins can be found in [plugins repository](https://plugins.jenkins Edit Custom Resource under `spec.master.plugins`: -``` +```yaml apiVersion: jenkins.io/v1alpha2 kind: Jenkins metadata: @@ -51,19 +52,19 @@ spec: master: basePlugins: - name: kubernetes - version: "1.29.2" + version: "1.30.0" - name: workflow-job version: "2.40" - name: workflow-aggregator version: "2.6" - name: git - version: "4.5.0" + version: "4.7.2" - name: job-dsl version: "1.77" - name: configuration-as-code - version: "1.47" + version: "1.51" - name: kubernetes-credentials-provider - version: "0.15" + version: "0.18-1" ``` You can change their versions.