From a34d3bbccf4aa6db6e338ffa83443c24db6dfecf Mon Sep 17 00:00:00 2001 From: Shane Starcher Date: Tue, 7 May 2019 11:52:33 -0700 Subject: [PATCH] allow changing of the target port to support TLS termination sidecar (#13576) * allow changing of the target port to support TLS termination sidecar Signed-off-by: Shane Starcher * allow changing of the target port to support TLS termination sidecar Signed-off-by: Shane Starcher --- stable/jenkins/Chart.yaml | 2 +- stable/jenkins/README.md | 1 + stable/jenkins/templates/jenkins-master-networkpolicy.yaml | 2 +- stable/jenkins/templates/jenkins-master-svc.yaml | 2 +- stable/jenkins/values.yaml | 1 + 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml index 778ce6b5e6..76ab8376ec 100755 --- a/stable/jenkins/Chart.yaml +++ b/stable/jenkins/Chart.yaml @@ -1,6 +1,6 @@ name: jenkins home: https://jenkins.io/ -version: 1.1.15 +version: 1.1.16 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 da7e7db40c..10e3ab6ebf 100644 --- a/stable/jenkins/README.md +++ b/stable/jenkins/README.md @@ -86,6 +86,7 @@ The following tables list the configurable parameters of the Jenkins chart and t | `master.serviceAnnotations` | Service annotations | `{}` | | `master.serviceType` | k8s service type | `LoadBalancer` | | `master.servicePort` | k8s service port | `8080` | +| `master.targetPort` | k8s target port | `8080` | | `master.nodePort` | k8s node port | Not set | | `master.healthProbes` | Enable k8s liveness and readiness probes | `true` | | `master.healthProbesLivenessTimeout` | Set the timeout for the liveness probe | `120` | diff --git a/stable/jenkins/templates/jenkins-master-networkpolicy.yaml b/stable/jenkins/templates/jenkins-master-networkpolicy.yaml index 18080903df..7ae1e594e3 100644 --- a/stable/jenkins/templates/jenkins-master-networkpolicy.yaml +++ b/stable/jenkins/templates/jenkins-master-networkpolicy.yaml @@ -17,7 +17,7 @@ spec: ingress: # Allow web access to the UI - ports: - - port: 8080 + - port: {{ .Values.master.targetPort }} # Allow inbound connections from slave - from: - podSelector: diff --git a/stable/jenkins/templates/jenkins-master-svc.yaml b/stable/jenkins/templates/jenkins-master-svc.yaml index 6201ddc870..81a7ce29ea 100644 --- a/stable/jenkins/templates/jenkins-master-svc.yaml +++ b/stable/jenkins/templates/jenkins-master-svc.yaml @@ -19,7 +19,7 @@ spec: ports: - port: {{.Values.master.servicePort}} name: http - targetPort: 8080 + targetPort: {{ .Values.master.targetPort }} {{if (and (eq .Values.master.serviceType "NodePort") (not (empty .Values.master.nodePort)))}} nodePort: {{.Values.master.nodePort}} {{end}} diff --git a/stable/jenkins/values.yaml b/stable/jenkins/values.yaml index ecb17eaf27..0e3e322c9c 100644 --- a/stable/jenkins/values.yaml +++ b/stable/jenkins/values.yaml @@ -77,6 +77,7 @@ master: # runAsUser: # fsGroup: servicePort: 8080 + targetPort: 8080 # For minikube, set this to NodePort, elsewhere use LoadBalancer # Use ClusterIP if your setup includes ingress controller serviceType: LoadBalancer