diff --git a/stable/jenkins/CHANGELOG.md b/stable/jenkins/CHANGELOG.md index 1ac1831b4e..b1370f3096 100644 --- a/stable/jenkins/CHANGELOG.md +++ b/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 diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml index 8327464baa..b022f796d4 100644 --- a/stable/jenkins/Chart.yaml +++ b/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 diff --git a/stable/jenkins/README.md b/stable/jenkins/README.md index 8b230e36e6..2a7ff63ca1 100644 --- a/stable/jenkins/README.md +++ b/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 | diff --git a/stable/jenkins/templates/jenkins-master-svc.yaml b/stable/jenkins/templates/jenkins-master-svc.yaml index 8a009a7489..76ad6d709d 100644 --- a/stable/jenkins/templates/jenkins-master-svc.yaml +++ b/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