From 97699a801f06c20b4d0a285102a01a4ba5c9e30e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Lino?= <jl@joaolino.com>
Date: Wed, 15 Apr 2020 17:53:08 +0100
Subject: [PATCH] Switched docker agent for a docker template and enabled the
 configuration as code option for it to be configured.

---
 values.yaml | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/values.yaml b/values.yaml
index f47739c..f86c541 100644
--- a/values.yaml
+++ b/values.yaml
@@ -311,10 +311,13 @@ master:
   # become the content of the configuration yaml file.  The first line after this is a JCasC root element, eg jenkins, credentials,
   # etc.  Best reference is https://<jenkins_url>/configuration-as-code/reference.  The example below creates a welcome message:
   JCasC:
-    enabled: false
-    defaultConfig: false
+    enabled: true
+    defaultConfig: true
     pluginVersion: "1.36"
-    configScripts: {}
+    configScripts:
+      welcome-message: |
+        jenkins:
+          systemMessage: Welcome to joaolino.com demo CI\CD server.  This Jenkins is configured and managed 'as code'.
     # welcome-message: |
     #   jenkins:
     #     systemMessage: Welcome to our CI\CD server.  This Jenkins is configured and managed 'as code'.
@@ -539,7 +542,11 @@ agent:
   # master.JCasC.enabled: true
   # master.JCasC.defaultConfig: true
   # Best reference is https://<jenkins_url>/configuration-as-code/reference#Cloud-kubernetes. The example below creates a python pod template.
-  podTemplates: {}
+  podTemplates:
+    docker: |
+      - name: docker
+        label: jenkins-docker
+        serviceAccount: jenkins
   #  python: |
   #    - name: python
   #      label: jenkins-python
@@ -558,10 +565,7 @@ agent:
 
 # Here you can add additional agents
 # They inherit all values from `agent` so you only need to specify values which differ
-additionalAgents:
-  docker:
-    podName: docker
-    customJenkinsLabels: docker
+additionalAgents: {}
 #  maven:
 #    podName: maven
 #    customJenkinsLabels: maven
-- 
2.24.1