From 3ecde5dbf62553ff8928cd6b3b01af18211f0b36 Mon Sep 17 00:00:00 2001 From: Graeme Wilson Date: Sun, 2 Sep 2018 01:04:17 +0800 Subject: [PATCH] [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 Signed-off-by: Graeme Wilson * [stable/jenkins] add custom jenkins labels to the build agent fixes Author: Graeme Wilson Signed-off-by: Graeme Wilson --- stable/jenkins/Chart.yaml | 2 +- stable/jenkins/README.md | 21 +++++++++++---------- stable/jenkins/templates/config.yaml | 2 +- stable/jenkins/values.yaml | 1 + 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml index 2a2f366f53..0cf5497d73 100755 --- a/stable/jenkins/Chart.yaml +++ b/stable/jenkins/Chart.yaml @@ -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 diff --git a/stable/jenkins/README.md b/stable/jenkins/README.md index e1e04d2304..9d42f470fa 100644 --- a/stable/jenkins/README.md +++ b/stable/jenkins/README.md @@ -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`. diff --git a/stable/jenkins/templates/config.yaml b/stable/jenkins/templates/config.yaml index afab208694..5b6cfdc0d8 100644 --- a/stable/jenkins/templates/config.yaml +++ b/stable/jenkins/templates/config.yaml @@ -35,7 +35,7 @@ data: default 2147483647 0 - + {{- $local := dict "first" true }} {{- range $key, $value := .Values.Agent.NodeSelector }} diff --git a/stable/jenkins/values.yaml b/stable/jenkins/values.yaml index 100a9b66bd..534bb291d0 100644 --- a/stable/jenkins/values.yaml +++ b/stable/jenkins/values.yaml @@ -130,6 +130,7 @@ Agent: Enabled: true Image: jenkins/jnlp-slave ImageTag: 3.10-1 + CustomJenkinsLabels: [] # ImagePullSecret: jenkins Component: "jenkins-slave" Privileged: false