github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-23 22:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

add support for explicit NodePort on jenkins chart (#342)

Browse Source 
* add support for explicit NodePort on jenkins chart

* jenkins: bump version to 0.1.7

* jenkins: loadBalancerSourceRanges only when LB service

* jenkins: Fix delete
This commit is contained in:
Danny Davidson
2017-01-26 09:11:27 -08:00
committed by Adnan Abdulhussein
parent 6d0d38804e
commit f63c188daa
4 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/jenkins/README.md
+15 -12
View File
@@ -26,18 +26,21 @@ The following tables lists the configurable parameters of the Jenkins chart and
### Jenkins Master
| Parameter | Description | Default |
| ----------------------- | ---------------------------------- | ---------------------------------------------------------- |
| `Master.Name` | Jenkins master name | `jenkins-master` |
| `Master.Image` | Master image name | `gcr.io/kubernetes-charts-ci/jenkins-master-k8s` |
| `Master.ImageTag` | Master image tag | `v0.1.0` |
| `Master.ImagePullPolicy` | Master image pull policy | `Always` |
| `Master.Component` | k8s selector key | `jenkins-master` |
| `Master.Cpu` | Master requested cpu | `200m` |
| `Master.Memory` | Master requested memory | `256Mi` |
| `Master.ServicePort` | k8s service port | `8080` |
| `Master.ContainerPort` | Master listening port | `8080` |
| `Master.SlaveListenerPort` | Listening port for agents | `50000` |
| Parameter | Description | Default |
| ----------------------- | ---------------------------------- | ---------------------------------------------------------- |
| `Master.Name` | Jenkins master name | `jenkins-master` |
| `Master.Image` | Master image name | `gcr.io/kubernetes-charts-ci/jenkins-master-k8s` |
| `Master.ImageTag` | Master image tag | `v0.1.0` |
| `Master.ImagePullPolicy` | Master image pull policy | `Always` |
| `Master.Component` | k8s selector key | `jenkins-master` |
| `Master.Cpu` | Master requested cpu | `200m` |
| `Master.Memory` | Master requested memory | `256Mi` |
| `Master.ServiceType` | k8s service type | `LoadBalancer` |
| `Master.ServicePort` | k8s service port | `8080` |
| `Master.NodePort` | k8s node port | Not set |
| `Master.ContainerPort` | Master listening port | `8080` |
| `Master.SlaveListenerPort` | Listening port for agents | `50000` |
| `Master.LoadBalancerSourceRanges` | Allowed inbound IP addresses | `0.0.0.0/0` |
### Jenkins Agent
stable/jenkins/templates/home-pvc.yaml
-1
View File
@@ -1,5 +1,4 @@
{{- if .Values.Persistence.Enabled }}
---
kind: PersistentVolumeClaim
apiVersion: v1
metadata:
stable/jenkins/templates/jenkins-master-svc.yaml
+5
View File
@@ -14,10 +14,15 @@ spec:
- port: {{.Values.Master.ServicePort}}
name: http
targetPort: {{.Values.Master.ContainerPort}}
{{if (and (eq .Values.Master.ServiceType "NodePort") (not (empty .Values.Master.NodePort)))}}
nodePort: {{.Values.Master.NodePort}}
{{end}}
- port: {{.Values.Master.SlaveListenerPort}}
targetPort: {{.Values.Master.SlaveListenerPort}}
name: slavelistener
selector:
component: "{{.Release.Name}}-{{.Values.Master.Component}}"
type: {{.Values.Master.ServiceType}}
{{if eq .Values.Master.ServiceType "LoadBalancer"}}
loadBalancerSourceRanges: {{.Values.Master.LoadBalancerSourceRanges}}
{{end}}
stable/jenkins/values.yaml
+1
View File
@@ -18,6 +18,7 @@ Master:
ServicePort: 8080
# For minikube, set this to NodePort, elsewhere use LoadBalancer
ServiceType: LoadBalancer
# NodePort: <to set explicitly, choose port between 30000-32767
ContainerPort: 8080
SlaveListenerPort: 50000
LoadBalancerSourceRanges: