[stable/jenkins] (#20067)

* Implemented slaveListenerLoadBalancerIP

Signed-off-by: Alberto Geniola <albertogeniola@gmail.com>

* Bumped chart version

Signed-off-by: Alberto Geniola <albertogeniola@gmail.com>

* Check presence of slaveListenerLoadBalancerIP before assigningment

Signed-off-by: Alberto Geniola <albertogeniola@gmail.com>
This commit is contained in:
Alberto Geniola
2020-01-12 10:25:37 -08:00
committed by Kubernetes Prow Robot
parent 26b4683f96
commit 74ef430134
4 changed files with 11 additions and 1 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
apiVersion: v1
name: jenkins
home: https://jenkins.io/
version: 1.9.14
version: 1.9.15
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
+2
View File
@@ -107,6 +107,8 @@ The following tables list the configurable parameters of the Jenkins chart and t
| `master.csrf.defaultCrumbIssuer.enabled` | Enable the default CSRF Crumb issuer | `true` |
| `master.csrf.defaultCrumbIssuer.proxyCompatability` | Enable proxy compatibility | `true` |
| `master.cli` | Enable CLI over remoting | `false` |
| `master.slaveListenerServiceType` | Defines how to expose the slaveListener service | `ClusterIP` |
| `master.slaveListenerLoadBalancerIP` | Static IP for the slaveListener LoadBalancer | Not set |
| `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 |
@@ -25,3 +25,8 @@ spec:
"app.kubernetes.io/component": "{{ .Values.master.componentName }}"
"app.kubernetes.io/instance": "{{ .Release.Name }}"
type: {{ .Values.master.slaveListenerServiceType }}
{{ if eq .Values.master.slaveListenerServiceType "LoadBalancer" }}
{{ if .Values.master.slaveListenerLoadBalancerIP }}
loadBalancerIP: {{ .Values.master.slaveListenerLoadBalancerIP }}
{{end}}
{{end}}
+3
View File
@@ -181,6 +181,9 @@ master:
# this will be an external load balancer and allowing inbound 0.0.0.0/0, a HUGE
# security risk: https://github.com/kubernetes/charts/issues/1341
slaveListenerServiceType: "ClusterIP"
# Optionally assign an IP to the LoadBalancer slaveListenerService LoadBalancer
# GKE users: only regional static IPs will work for Service Load balancer.
# slaveListenerLoadBalancerIP: 1.2.3.4
slaveListenerServiceAnnotations: {}
slaveKubernetesNamespace: