From d39f1140849f2ad7244e143264b327d1d2d2b658 Mon Sep 17 00:00:00 2001 From: sundbp Date: Tue, 15 Aug 2017 00:49:15 +0100 Subject: [PATCH] jenkins: add optional LoadBalancerIP option. (#1568) * jenkins: add optional LoadBalancerIP option. To support running the master on a pre-allocated external IP we need to expose the `loadBalancerIP` part of the service template. * Update Chart.yaml --- stable/jenkins/Chart.yaml | 2 +- stable/jenkins/README.md | 1 + stable/jenkins/templates/jenkins-master-svc.yaml | 3 +++ stable/jenkins/values.yaml | 10 ++++++---- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml index 9cc9833385..5be927e603 100755 --- a/stable/jenkins/Chart.yaml +++ b/stable/jenkins/Chart.yaml @@ -1,6 +1,6 @@ name: jenkins home: https://jenkins.io/ -version: 0.8.6 +version: 0.8.7 appVersion: 2.67 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 projects as well as arbitrary scripts. sources: diff --git a/stable/jenkins/README.md b/stable/jenkins/README.md index d6d414ddd8..0ca71ee40b 100644 --- a/stable/jenkins/README.md +++ b/stable/jenkins/README.md @@ -41,6 +41,7 @@ The following tables lists the configurable parameters of the Jenkins chart and | `Master.ContainerPort` | Master listening port | `8080` | | `Master.SlaveListenerPort` | Listening port for agents | `50000` | | `Master.LoadBalancerSourceRanges` | Allowed inbound IP addresses | `0.0.0.0/0` | +| `Master.LoadBalancerIP` | Optional fixed external IP | Not set | | `Master.JMXPort` | Open a port, for JMX stats | Not set | | `Master.CustomConfigMap` | Use a custom ConfigMap | `false` | | `Master.Ingress.Annotations` | Ingress annotations | `{}` | diff --git a/stable/jenkins/templates/jenkins-master-svc.yaml b/stable/jenkins/templates/jenkins-master-svc.yaml index e30b42552c..16785480dc 100644 --- a/stable/jenkins/templates/jenkins-master-svc.yaml +++ b/stable/jenkins/templates/jenkins-master-svc.yaml @@ -25,4 +25,7 @@ spec: type: {{.Values.Master.ServiceType}} {{if eq .Values.Master.ServiceType "LoadBalancer"}} loadBalancerSourceRanges: {{.Values.Master.LoadBalancerSourceRanges}} + {{if .Values.Master.LoadBalancerIP}} + loadBalancerIP: {{.Values.Master.LoadBalancerIP}} + {{end}} {{end}} diff --git a/stable/jenkins/values.yaml b/stable/jenkins/values.yaml index 3a88d239ef..e9add68e30 100644 --- a/stable/jenkins/values.yaml +++ b/stable/jenkins/values.yaml @@ -32,16 +32,18 @@ Master: SlaveListenerPort: 50000 LoadBalancerSourceRanges: - 0.0.0.0/0 +# Optionally assign a known public LB IP +# LoadBalancerIP: 1.2.3.4 # Optionally configure a JMX port # requires additional JavaOpts, ie # JavaOpts: > -# -Dcom.sun.management.jmxremote.port=4000 -# -Dcom.sun.management.jmxremote.authenticate=false -# -Dcom.sun.management.jmxremote.ssl=false +# -Dcom.sun.management.jmxremote.port=4000 +# -Dcom.sun.management.jmxremote.authenticate=false +# -Dcom.sun.management.jmxremote.ssl=false # JMXPort: 4000 # List of plugins to be install during Jenkins master start InstallPlugins: - - kubernetes:0.11 + - kubernetes:0.11 - workflow-aggregator:2.5 - workflow-job:2.13 - credentials-binding:1.12