[stable/jenkins]: helm#10131 (helm#11411)

Signed-off-by: Pascal Le Métayer <pascal.lemetayer@artal.fr>
wmcdona89 · Feb 14, 2019 · f8ac725 · f8ac725
1 parent 7340df3
commit f8ac725
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 6 deletions.
diff --git a/charts/jenkins/Chart.yaml b/charts/jenkins/Chart.yaml
@@ -1,6 +1,6 @@
 name: jenkins
 home: https://jenkins.io/
-version: 0.32.2
+version: 0.32.3
 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/charts/jenkins/README.md b/charts/jenkins/README.md
@@ -114,6 +114,13 @@ Some third-party systems, e.g. GitHub, use HTML-formatted data in their payload
 | `Agent.resources`          | Resources allocation (Requests and Limits)      | `{requests: {cpu: 200m, memory: 256Mi}, limits: {cpu: 200m, memory: 256Mi}}`|
 | `Agent.volumes`            | Additional volumes                              | `nil`                  |
 | `Agent.envVars             | Environment variables for the slave Pod         | Not set                |
+| `Agent.Command             | Executed command when side container starts     | Not set                |
+| `Agent.Args                | Arguments passed to executed command            | Not set                |
+| `Agent.SideContainerName   | Side container name in agent                    | jnlp                   |
+| `Agent.TTYEnabled          | Allocate pseudo tty to the side container       | false                  |
+| `Agent.ContainerCap        | Maximum number of agent                         | 10                     |
+| `Agent.PodName             | slave Pod base name                             | Not set                |
+
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.
 

diff --git a/charts/jenkins/templates/config.yaml b/charts/jenkins/templates/config.yaml
@@ -46,7 +46,7 @@ data:
 {{- if .Values.Agent.Enabled }}
             <org.csanchez.jenkins.plugins.kubernetes.PodTemplate>
               <inheritFrom></inheritFrom>
-              <name>default</name>
+              <name>{{ .Values.Agent.PodName }}</name>
               <instanceCap>2147483647</instanceCap>
               <idleMinutes>0</idleMinutes>
               <label>{{ .Release.Name }}-{{ .Values.Agent.Component }} {{ .Values.Agent.CustomJenkinsLabels  | join " " }}</label>
@@ -69,7 +69,7 @@ data:
               </volumes>
               <containers>
                 <org.csanchez.jenkins.plugins.kubernetes.ContainerTemplate>
-                  <name>jnlp</name>
+                  <name>{{ .Values.Agent.SideContainerName }}</name>
                   <image>{{ .Values.Agent.Image }}:{{ .Values.Agent.ImageTag }}</image>
 {{- if .Values.Agent.Privileged }}
                   <privileged>true</privileged>
@@ -78,9 +78,13 @@ data:
 {{- end }}
                   <alwaysPullImage>{{ .Values.Agent.AlwaysPullImage }}</alwaysPullImage>
                   <workingDir>/home/jenkins</workingDir>
-                  <command></command>
+                  <command>{{ .Values.Agent.Command }}</command>
+{{- if .Values.Agent.Args }}
+                  <args>{{ .Values.Agent.Args }}</args>
+{{- else }}
                   <args>${computer.jnlpmac} ${computer.name}</args>
-                  <ttyEnabled>false</ttyEnabled>
+{{- end }}
+                  <ttyEnabled>{{ .Values.Agent.TTYEnabled }}</ttyEnabled>
                   # Resources configuration is a little hacky. This was to prevent breaking
                   # changes, and should be cleanned up in the future once everybody had
                   # enough time to migrate.
@@ -133,7 +137,7 @@ data:
           <jenkinsUrl>http://{{ template "jenkins.fullname" . }}:{{.Values.Master.ServicePort}}{{ default "" .Values.Master.JenkinsUriPrefix }}</jenkinsUrl>
           <jenkinsTunnel>{{ template "jenkins.fullname" . }}-agent:{{ .Values.Master.SlaveListenerPort }}</jenkinsTunnel>
 {{- end }}
-          <containerCap>10</containerCap>
+          <containerCap>{{ .Values.Agent.ContainerCap }}</containerCap>
           <retentionTimeout>5</retentionTimeout>
           <connectTimeout>0</connectTimeout>
           <readTimeout>0</readTimeout>

diff --git a/charts/jenkins/values.yaml b/charts/jenkins/values.yaml
@@ -291,6 +291,18 @@ Agent:
   # Key Value selectors. Ex:
   # jenkins-agent: v1
 
+  # Executed command when side container gets started
+  Command:
+  Args:
+  # Side container name
+  SideContainerName: jnlp
+  # Doesn't allocate pseudo TTY by default
+  TTYEnabled: false
+  # Max number of spawned agent
+  ContainerCap: 10
+  # Pod name
+  PodName: default
+
 Persistence:
   Enabled: true
   ## A manually managed Persistent Volume and Claim