From 217e4a9972ae73a25fc49c155ed3d97a30a5646e Mon Sep 17 00:00:00 2001
From: Kyle Michel <kylermichel@gmail.com>
Date: Wed, 13 May 2020 17:06:28 -0400
Subject: [PATCH] [stable/jenkins] Jenkins default configuration options
 (#22318)

* Add additional options to casc defaults

Signed-off-by: Kyle Michel <kylermichel@gmail.com>

* Bump chart version

Signed-off-by: Kyle Michel <kylermichel@gmail.com>

* Requested PR changes

Signed-off-by: Kyle Michel <kylermichel@gmail.com>

* Change how to override the markup formatter

Signed-off-by: Kyle Michel <kylermichel@gmail.com>
---
 stable/jenkins/CHANGELOG.md           | 5 +++++
 stable/jenkins/Chart.yaml             | 2 +-
 stable/jenkins/README.md              | 2 ++
 stable/jenkins/templates/_helpers.tpl | 4 ++--
 stable/jenkins/templates/config.yaml  | 2 +-
 stable/jenkins/values.yaml            | 3 +++
 6 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/stable/jenkins/CHANGELOG.md b/stable/jenkins/CHANGELOG.md
index e54c4f2fc2..e8b1f9f5a7 100644
--- a/stable/jenkins/CHANGELOG.md
+++ b/stable/jenkins/CHANGELOG.md
@@ -5,6 +5,11 @@ numbering uses [semantic versioning](http://semver.org).
 
 NOTE: The change log until version 1.5.7 is auto generated based on git commits. Those include a reference to the git commit to be able to get more details.
 
+## 1.19.0
+
+Add support for disabling remember me via `master.disableRememberMe`
+Add support for using a different markup formatter via `master.markupFormatter`
+
 ## 1.18.1
 
 Add support for executor mode configuraton with `master.executorMode`.
diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml
index 0eff8d8bd5..eddec4c642 100644
--- a/stable/jenkins/Chart.yaml
+++ b/stable/jenkins/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: jenkins
 home: https://jenkins.io/
-version: 1.18.1
+version: 1.19.0
 appVersion: lts
 description: Open source continuous integration server. It supports multiple SCM tools
   including CVS, Subversion and Git. It can execute Apache Ant and Apache Maven-based
diff --git a/stable/jenkins/README.md b/stable/jenkins/README.md
index a4d139896f..e5a92f118e 100644
--- a/stable/jenkins/README.md
+++ b/stable/jenkins/README.md
@@ -68,8 +68,10 @@ The following tables list the configurable parameters of the Jenkins chart and t
 | `master.tag`                      | Master image tag                     | `lts`                                     |
 | `master.imagePullPolicy`          | Master image pull policy             | `Always`                                  |
 | `master.imagePullSecretName`      | Master image pull secret             | Not set                                   |
+| `master.disableRememberMe`        | Disable use of remember me           | `false`                                   |
 | `master.numExecutors`             | Set Number of executors              | 0                                         |
 | `master.executorMode`             | Set executor mode of the Jenkins node. Possible values are: NORMAL or EXCLUSIVE | NORMAL |
+| `master.markupFormatter`          | Yaml of the markup formatter to use  | `plainText`                               |
 | `master.customJenkinsLabels`      | Append Jenkins labels to the master  | `{}`                                      |
 | `master.useSecurity`              | Use basic security                   | `true`                                    |
 | `master.securityRealm`            | Custom Security Realm                | Not set                                   |
diff --git a/stable/jenkins/templates/_helpers.tpl b/stable/jenkins/templates/_helpers.tpl
index 926a7b24e8..8f50abd221 100644
--- a/stable/jenkins/templates/_helpers.tpl
+++ b/stable/jenkins/templates/_helpers.tpl
@@ -72,7 +72,7 @@ Returns configuration as code default config
 */}}
 {{- define "jenkins.casc.defaults" -}}
 jenkins:
-  disableRememberMe: false
+  disableRememberMe: {{ .Values.master.disableRememberMe }}
   remotingSecurity:
     enabled: true
   mode: {{ .Values.master.executorMode }}
@@ -83,7 +83,7 @@ jenkins:
     rawHtml:
       disableSyntaxHighlighting: true
     {{- else }}
-      "plainText"
+    {{- toYaml .Values.master.markupFormatter | nindent 4 }}
     {{- end }}
   clouds:
   - kubernetes:
diff --git a/stable/jenkins/templates/config.yaml b/stable/jenkins/templates/config.yaml
index c90559c45a..93e5ab21c5 100644
--- a/stable/jenkins/templates/config.yaml
+++ b/stable/jenkins/templates/config.yaml
@@ -28,7 +28,7 @@ data:
       <useSecurity>{{ .Values.master.useSecurity }}</useSecurity>
 {{ .Values.master.authorizationStrategy | indent 6 }}
 {{ .Values.master.securityRealm | indent 6 }}
-      <disableRememberMe>false</disableRememberMe>
+      <disableRememberMe>{{ .Values.master.disableRememberMe }}</disableRememberMe>
       <projectNamingStrategy class="jenkins.model.ProjectNamingStrategy$DefaultProjectNamingStrategy"/>
       <workspaceDir>${JENKINS_HOME}/workspace/${ITEM_FULLNAME}</workspaceDir>
       <buildsDir>${ITEM_ROOTDIR}/builds</buildsDir>
diff --git a/stable/jenkins/values.yaml b/stable/jenkins/values.yaml
index d48eb7ad36..22955a2132 100644
--- a/stable/jenkins/values.yaml
+++ b/stable/jenkins/values.yaml
@@ -76,9 +76,12 @@ master:
   #      command:
   #      - "uname"
   #      - "-a"
+  disableRememberMe: false
   numExecutors: 0
   # configures the executor mode of the Jenkins node. Possible values are: NORMAL or EXCLUSIVE
   executorMode: "NORMAL"
+  # This is ignored if enableRawHtmlMarkupFormatter is true
+  markupFormatter: plainText
   customJenkinsLabels: []
   # configAutoReload requires UseSecurity is set to true:
   useSecurity: true