1
0

Merge branch 'master' of P129679/molgenis-ops-docker-helm into master

This commit is contained in:
Sido Haakma
2018-06-30 00:22:31 +02:00
committed by Gogs
2 changed files with 4 additions and 9 deletions

View File

@ -77,7 +77,7 @@ data:
<alwaysPullImage>false</alwaysPullImage>
{{- end }}
<workingDir>/home/jenkins</workingDir>
<command>{{ .Command | default "cat" }}</command>
<command>{{ .Command | default "" }}</command>
<args>{{ .Args | default "" }}</args>
{{- if .TTY }}
<ttyEnabled>true</ttyEnabled>
@ -129,7 +129,7 @@ data:
<namespace>{{ .Release.Namespace }}</namespace>
<jenkinsUrl>http://{{ template "jenkins.fullname" . }}:{{.Values.Master.ServicePort}}{{ default "" .Values.Master.JenkinsUriPrefix }}</jenkinsUrl>
<jenkinsTunnel>{{ template "jenkins.fullname" . }}-agent:50000</jenkinsTunnel>
<containerCap>10</containerCap>
<containerCap>50</containerCap>
<retentionTimeout>5</retentionTimeout>
<connectTimeout>0</connectTimeout>
<readTimeout>0</readTimeout>