From 64e82fa6af7823eb33c2dd721ec633ebcd94df93 Mon Sep 17 00:00:00 2001 From: Simon Wydooghe Date: Tue, 6 Mar 2018 21:08:53 +0100 Subject: [PATCH] [stable/jenkins] Add affinity settings (#3839) * Add affinity settings * Minor version bump to 1.14.0 --- stable/jenkins/Chart.yaml | 2 +- stable/jenkins/README.md | 1 + stable/jenkins/templates/jenkins-master-deployment.yaml | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml index 1490498801..347ed4d649 100755 --- a/stable/jenkins/Chart.yaml +++ b/stable/jenkins/Chart.yaml @@ -1,6 +1,6 @@ name: jenkins home: https://jenkins.io/ -version: 0.13.5 +version: 0.14.0 appVersion: 2.73 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 cdeb277777..4020d09dd5 100644 --- a/stable/jenkins/README.md +++ b/stable/jenkins/README.md @@ -63,6 +63,7 @@ The following tables lists the configurable parameters of the Jenkins chart and | `Master.InstallPlugins` | List of Jenkins plugins to install | `kubernetes:0.11 workflow-aggregator:2.5 credentials-binding:1.11 git:3.2.0` | | `Master.ScriptApproval` | List of groovy functions to approve | Not set | | `Master.NodeSelector` | Node labels for pod assignment | `{}` | +| `Master.Affinity` | Affinity settings | `{}` | | `Master.Tolerations` | Toleration labels for pod assignment | `{}` | | `NetworkPolicy.Enabled` | Enable creation of NetworkPolicy resources. | `false` | | `NetworkPolicy.ApiVersion` | NetworkPolicy ApiVersion | `extensions/v1beta1` | diff --git a/stable/jenkins/templates/jenkins-master-deployment.yaml b/stable/jenkins/templates/jenkins-master-deployment.yaml index b4dbc60975..6260c41393 100644 --- a/stable/jenkins/templates/jenkins-master-deployment.yaml +++ b/stable/jenkins/templates/jenkins-master-deployment.yaml @@ -32,6 +32,10 @@ spec: {{- if .Values.Master.Tolerations }} tolerations: {{ toYaml .Values.Master.Tolerations | indent 8 }} + {{- end }} + {{- if .Values.Master.Affinity }} + affinity: +{{ toYaml .Values.Master.Affinity | indent 8 }} {{- end }} securityContext: runAsUser: {{ default 0 .Values.Master.RunAsUser }}