[stable/jenkins] add custom jenkins labels to the build agent (#7167)

* [stable/jenkins] add custom jenkins labels to the build agent fixes

 Author:    Graeme Wilson <graeme@techlunacy.com>

Signed-off-by: Graeme Wilson <graeme@techlunacy.com>

* [stable/jenkins] add custom jenkins labels to the build agent fixes

 Author:    Graeme Wilson <graeme@techlunacy.com>

Signed-off-by: Graeme Wilson <graeme@techlunacy.com>
This commit is contained in:
Graeme Wilson
2018-09-01 10:04:17 -07:00
committed by k8s-ci-robot
parent c783c59560
commit 3ecde5dbf6
4 changed files with 14 additions and 12 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
name: jenkins
home: https://jenkins.io/
version: 0.16.24
version: 0.16.25
appVersion: 2.121.3
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
+11 -10
View File
@@ -84,16 +84,17 @@ The following tables list the configurable parameters of the Jenkins chart and t
### Jenkins Agent
| Parameter | Description | Default |
| ----------------------- | ----------------------------------------------- | ---------------------- |
| `Agent.AlwaysPullImage` | Always pull agent container image before build | `false` |
| `Agent.Enabled` | Enable Kubernetes plugin jnlp-agent podTemplate | `true` |
| `Agent.Image` | Agent image name | `jenkinsci/jnlp-slave` |
| `Agent.ImagePullSecret` | Agent image pull secret | Not set |
| `Agent.ImageTag` | Agent image tag | `2.62` |
| `Agent.Privileged` | Agent privileged container | `false` |
| `Agent.resources` | Resources allocation (Requests and Limits) | `{requests: {cpu: 200m, memory: 256Mi}, limits: {cpu: 200m, memory: 256Mi}}`|
| `Agent.volumes` | Additional volumes | `nil` |
| Parameter | Description | Default |
| -------------------------- | ----------------------------------------------- | ---------------------- |
| `Agent.AlwaysPullImage` | Always pull agent container image before build | `false` |
| `Agent.CustomJenkinsLabels`| Append Jenkins labels to the agent | `{}` |
| `Agent.Enabled` | Enable Kubernetes plugin jnlp-agent podTemplate | `true` |
| `Agent.Image` | Agent image name | `jenkinsci/jnlp-slave` |
| `Agent.ImagePullSecret` | Agent image pull secret | Not set |
| `Agent.ImageTag` | Agent image tag | `2.62` |
| `Agent.Privileged` | Agent privileged container | `false` |
| `Agent.resources` | Resources allocation (Requests and Limits) | `{requests: {cpu: 200m, memory: 256Mi}, limits: {cpu: 200m, memory: 256Mi}}`|
| `Agent.volumes` | Additional volumes | `nil` |
Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.
+1 -1
View File
@@ -35,7 +35,7 @@ data:
<name>default</name>
<instanceCap>2147483647</instanceCap>
<idleMinutes>0</idleMinutes>
<label>{{ .Release.Name }}-{{ .Values.Agent.Component }}</label>
<label>{{ .Release.Name }}-{{ .Values.Agent.Component }} {{ .Values.Agent.CustomJenkinsLabels | join " " }}</label>
<nodeSelector>
{{- $local := dict "first" true }}
{{- range $key, $value := .Values.Agent.NodeSelector }}
+1
View File
@@ -130,6 +130,7 @@ Agent:
Enabled: true
Image: jenkins/jnlp-slave
ImageTag: 3.10-1
CustomJenkinsLabels: []
# ImagePullSecret: jenkins
Component: "jenkins-slave"
Privileged: false