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

molgenis-jenkins/templates/config.tpl

@@ -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>

molgenis-jenkins/values.yaml

@@ -97,19 +97,15 @@ jenkins:
       Containers:
         maven:
           Image: "registry.webhosting.rug.nl/molgenis/maven"
+          Command: cat
           TTY: true
-          resources:
-            requests:
-              cpu: "1000m"
-            limits:
-              memory: "1Gi"
         alpine:
           Image: "spotify/alpine"
+          Command: cat
           TTY: true
         elasticsearch:
           Image: "elasticsearch"
           ImageTag: "5.5.1"
-          TTY: true
           Ports:
             - name: rest
               containerPort: "9200"
@@ -120,7 +116,6 @@ jenkins:
         postgres:
           Image: "postgres"
           ImageTag: "9.6-alpine"
-          TTY: true
           Ports:
             - name: postgres
               containerPort: "5432"