From 9dc7e91568a67077e685fba901b3ff37a000e37e Mon Sep 17 00:00:00 2001
From: Torsten Walter <torsten.walter@syncier.com>
Date: Mon, 20 Apr 2020 14:01:39 +0200
Subject: [PATCH] [stable/jenkins] update plugin version & sidecar container
 (#22008)

* [stable/jenkins] update plugin version & sidecar container

Signed-off-by: Torsten Walter <torsten.walter@syncier.com>

* Test additional values

Signed-off-by: Torsten Walter <torsten.walter@syncier.com>
---
 stable/jenkins/CHANGELOG.md         | 15 ++++++++++++
 stable/jenkins/Chart.yaml           |  2 +-
 stable/jenkins/ci/other-values.yaml | 37 +++++++++++++++++++++++++++++
 stable/jenkins/values.yaml          | 10 ++++----
 4 files changed, 58 insertions(+), 6 deletions(-)
 create mode 100644 stable/jenkins/ci/other-values.yaml

diff --git a/stable/jenkins/CHANGELOG.md b/stable/jenkins/CHANGELOG.md
index 751da76483..73383a42fe 100644
--- a/stable/jenkins/CHANGELOG.md
+++ b/stable/jenkins/CHANGELOG.md
@@ -5,6 +5,21 @@ 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.15.0 Update plugin versions & sidecar container
+
+| plugin                | old version | new version |
+| --------------------- | ----------- | ----------- |
+| kubernetes            | 1.25.1      | 1.25.3      |
+| workflow-job          | 2.36        | 2.38        |
+| git                   | 4.2.0       | 4.2.2       |
+| configuration-as-code | 1.36        | 1.39        |
+
+configAutoReload container updated from `kiwigrid/k8s-sidecar:0.1.20` to `kiwigrid/k8s-sidecar:0.1.132`
+
+## 1.14.0
+
+support auto-reload container environment variables configuration
+
 ## 1.13.3
 
 Fix wrong indent in tolerations
diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml
index f74f79b0bb..9773ee3e05 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.14.0
+version: 1.15.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/ci/other-values.yaml b/stable/jenkins/ci/other-values.yaml
new file mode 100644
index 0000000000..f9c0c116e8
--- /dev/null
+++ b/stable/jenkins/ci/other-values.yaml
@@ -0,0 +1,37 @@
+agent:
+  resources:
+    limits:
+      cpu: "1"
+      memory: "2048Mi"
+  additionalAgents:
+    maven:
+      podName: maven
+      customJenkinsLabels: maven
+      # An example of overriding the jnlp container
+      # sideContainerName: jnlp
+      image: jenkins/jnlp-agent-maven
+      tag: latest
+    python:
+      podName: python
+      customJenkinsLabels: python
+      sideContainerName: python
+      image: python
+      tag: "3"
+      command: "/bin/sh -c"
+      args: "cat"
+      TTYEnabled: true
+  podTemplates:
+    python: |
+      - name: python
+        label: jenkins-python
+        containers:
+          - name: python
+            image: python:3
+            command: "/bin/sh -c"
+            args: "cat"
+            ttyEnabled: true
+            privileged: true
+            resourceRequestCpu: "400m"
+            resourceRequestMemory: "512Mi"
+            resourceLimitCpu: "1"
+            resourceLimitMemory: "1024Mi"
diff --git a/stable/jenkins/values.yaml b/stable/jenkins/values.yaml
index 963eb2d3b9..170ec9ef8a 100644
--- a/stable/jenkins/values.yaml
+++ b/stable/jenkins/values.yaml
@@ -212,11 +212,11 @@ master:
 
   # List of plugins to be install during Jenkins master start
   installPlugins:
-    - kubernetes:1.25.1
-    - workflow-job:2.36
+    - kubernetes:1.25.3
+    - workflow-job:2.38
     - workflow-aggregator:2.6
     - credentials-binding:1.21
-    - git:4.2.0
+    - git:4.2.2
 
   # Enable to always override the installed plugins with the values of 'master.installPlugins' on upgrade or redeployment.
   # overwritePlugins: true
@@ -252,7 +252,7 @@ master:
   JCasC:
     enabled: false
     defaultConfig: false
-    pluginVersion: "1.36"
+    pluginVersion: "1.39"
     configScripts: {}
     # welcome-message: |
     #   jenkins:
@@ -270,7 +270,7 @@ master:
       # jcasc changes will cause a reboot and will only be applied at the subsequent start-up.  Auto-reload uses the
       # http://<jenkins_url>/reload-configuration-as-code endpoint to reapply config when changes to the configScripts are detected.
       enabled: false
-      image: kiwigrid/k8s-sidecar:0.1.20
+      image: kiwigrid/k8s-sidecar:0.1.132
       imagePullPolicy: IfNotPresent
       resources: {}
         #   limits: