[stable/jenkins] Add runAsUser and runAsGroup to podTemplate (helm#22641

) Signed-off-by: Jan Baraniewski <janekbaraniewski@gmail.com>
includerandom · Jul 19, 2020 · 5115ad1 · 5115ad1
1 parent d3b33f5
commit 5115ad1
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 1 deletion.
diff --git a/stable/jenkins/CHANGELOG.md b/stable/jenkins/CHANGELOG.md
@@ -5,6 +5,10 @@ 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.
 
+## 2.1.0
+
+Add support to set `runAsUser` and `runAsGroup` for `agent`.
+
 ## 2.0.1
 
 Only render authorizationStrategy and securityRealm when values are set.

diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: jenkins
 home: https://jenkins.io/
-version: 2.0.1
+version: 2.1.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
@@ -306,6 +306,8 @@ Some third-party systems, e.g. GitHub, use HTML-formatted data in their payload
 | `agent.slaveConnectTimeout`| Timeout in seconds for an agent to be online    | 100                    |
 | `agent.podTemplates`       | Configures extra pod templates for the default kubernetes cloud | `{}`   |
 | `agent.workingDir`         | Configure working directory for default agent   | `/home/jenkins`        |
+| `agent.runAsUser`          | Configure container user                        | Not set                |
+| `agent.runAsGroup`         | Configure container group                       | Not set                |
 | `additionalAgents`         | Configure additional agents which inherit values from `agent` | `{}`     |
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.

diff --git a/stable/jenkins/templates/_helpers.tpl b/stable/jenkins/templates/_helpers.tpl
@@ -192,6 +192,8 @@ Returns kubernetes pod template configuration as code
     resourceLimitMemory: {{.Values.agent.resources.limits.memory}}
     resourceRequestCpu: {{.Values.agent.resources.requests.cpu}}
     resourceRequestMemory: {{.Values.agent.resources.requests.memory}}
+    runAsUser: {{ .Values.agent.runAsUser }}
+    runAsGroup: {{ .Values.agent.runAsGroup }}
     ttyEnabled: {{ .Values.agent.TTYEnabled }}
     workingDir: {{ .Values.agent.workingDir }}
 {{- if .Values.agent.envVars }}

diff --git a/stable/jenkins/values.yaml b/stable/jenkins/values.yaml
@@ -459,6 +459,8 @@ agent:
   imagePullSecretName:
   componentName: "jenkins-slave"
   privileged: false
+  runAsUser:
+  runAsGroup:
   resources:
     requests:
       cpu: "512m"