Skip to content
This repository has been archived by the owner on Feb 22, 2022. It is now read-only.

Optionally adds liveness and readiness probes to jenkins #3245

Merged
merged 2 commits into from
Jan 8, 2018
Merged

Optionally adds liveness and readiness probes to jenkins #3245

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbaa040
Optionally adds liveness and readiness probes to jenkins
jtslear Jan 5, 2018
d798f4e
Addressing requested changes
jtslear Jan 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Addressing requested changes
  • Loading branch information
@jtslear
jtslear committed Jan 8, 2018
commit d798f4efc0cd57915e868bf5ca87f56a3dcbbe8d
2 changes: 1 addition & 1 deletion stable/jenkins/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ The following tables lists the configurable parameters of the Jenkins chart and
| `Master.ServiceType` | k8s service type | `LoadBalancer` |
| `Master.ServicePort` | k8s service port | `8080` |
| `Master.NodePort` | k8s node port | Not set |
| `Master.HealthProbes` | Enable k8s liveness and readiness probes | `false` |
| `Master.HealthProbes` | Enable k8s liveness and readiness probes | `true` |
| `Master.HealthProbesTimeout` | Set the timeout for the liveness and readiness probes | `120` |
| `Master.ContainerPort` | Master listening port | `8080` |
| `Master.SlaveListenerPort` | Listening port for agents | `50000` |
Expand Down
4 changes: 2 additions & 2 deletions stable/jenkins/templates/jenkins-master-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,12 @@ spec:
httpGet:
path: /login
port: http
initialDelaySeconds: {{ .Values.Master.HealthProbesTimeout | default 120 }}
initialDelaySeconds: {{ .Values.Master.HealthProbesTimeout }}
readinessProbe:
httpGet:
path: /login
port: http
initialDelaySeconds: {{ .Values.Master.HealthProbesTimeout | default 120 }}
initialDelaySeconds: {{ .Values.Master.HealthProbesTimeout }}
{{- end }}
resources:
requests:
Expand Down
3 changes: 2 additions & 1 deletion stable/jenkins/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ Master:
# NodePort: <to set explicitly, choose port between 30000-32767
ContainerPort: 8080
# Enable Kubernetes Liveness and Readiness Probes
HealthProbes: false
HealthProbes: true
HealthProbesTimeout: 120
SlaveListenerPort: 50000
LoadBalancerSourceRanges:
- 0.0.0.0/0
Expand Down