Add support for custom ClusterIP (#21878)

Signed-off-by: Fleeteo <contact@fleeteo.com>

stable/jenkins/CHANGELOG.md

@@ -5,6 +5,10 @@ numbering uses [semantic versioning](http://semver.org).
 
 NOTE: The change log until version 1.5.7 is auto generated based on git commits. Those include a reference to the git commit to be able to get more details.
 
+## 1.13.2
+
+Add support for custom ClusterIP
+
 ## 1.13.1
 
 Fix yaml template rendering in kubernetes pod template JCasC

stable/jenkins/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 name: jenkins
 home: https://jenkins.io/
 
-version: 1.13.1
+version: 1.13.2
 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

stable/jenkins/README.md

@@ -90,6 +90,7 @@ The following tables list the configurable parameters of the Jenkins chart and t
 | `master.hostAliases`              | Aliases for IPs in `/etc/hosts`      | `[]`                                      |
 | `master.serviceAnnotations`       | Service annotations                  | `{}`                                      |
 | `master.serviceType`              | k8s service type                     | `ClusterIP`                               |
+| `master.clusterIP`                | k8s service clusterIP                | Not set                                   |
 | `master.servicePort`              | k8s service port                     | `8080`                                    |
 | `master.targetPort`               | k8s target port                      | `8080`                                    |
 | `master.nodePort`                 | k8s node port                        | Not set                                   |

stable/jenkins/templates/jenkins-master-svc.yaml

@@ -17,6 +17,9 @@ metadata:
 {{ toYaml .Values.master.serviceAnnotations | indent 4 }}
 {{- end }}
 spec:
+  {{if (and (eq .Values.master.serviceType "ClusterIP") (not (empty .Values.master.clusterIP)))}}
+  clusterIP: {{.Values.master.clusterIP}}
+  {{end}}
   ports:
     - port: {{.Values.master.servicePort}}
       name: http