Fix #8: Make the containers in the jenkins pod template configurable through values

molgenis-jenkins/templates/config.tpl

@@ -34,7 +34,7 @@ data:
               <name>{{ $podName }}</name>
               <instanceCap>2147483647</instanceCap>
               <idleMinutes>0</idleMinutes>
-              <label>{{ .Release.Name }}-{{ $pod.Label }}</label>
+              <label>{{ $.Release.Name }}-{{ $pod.Label }}</label>
               <nodeSelector>
                 {{- $local := dict "first" true }}
                 {{- range $key, $value := $pod.NodeSelector }}
@@ -75,17 +75,23 @@ data:
 {{- else }}
                   <ttyEnabled>false</ttyEnabled>
 {{- end }}
-                  <resourceRequestCpu>{{ $container.resources.requests.cpu }}</resourceRequestCpu>
-                  <resourceRequestMemory>{{ $container.resources.requests.memory }}</resourceRequestMemory>
-                  <resourceLimitCpu>{{ $container.resources.limits.cpu }}</resourceLimitCpu>
-                  <resourceLimitMemory>{{ $container.resources.limits.memory }}</resourceLimitMemory>
+{{- if $container.resources }}
+{{- if $container.resources.requests }}
+                  <resourceRequestCpu>{{ $container.resources.requests.cpu | default "" }}</resourceRequestCpu>
+                  <resourceRequestMemory>{{ $container.resources.requests.memory | default "" }}</resourceRequestMemory>
+{{- end }}
+{{- if $container.resources.limits }}
+                  <resourceLimitCpu>{{ $container.resources.limits.cpu | default "" }}</resourceLimitCpu>
+                  <resourceLimitMemory>{{ $container.resources.limits.memory | default "" }}</resourceLimitMemory>
+{{- end }}
+{{- end }}
                 </org.csanchez.jenkins.plugins.kubernetes.ContainerTemplate>
 {{- end }}
               </containers>
               <envVars>
                   <org.csanchez.jenkins.plugins.kubernetes.model.KeyValueEnvVar>
                     <key>JENKINS_URL</key>
-                    <value>http://{{ template "jenkins.fullname" . }}:{{.Values.Master.ServicePort}}{{ default "" .Values.Master.JenkinsUriPrefix }}</value>
+                    <value>http://{{ template "jenkins.fullname" $ }}:{{$.Values.Master.ServicePort}}{{ default "" $.Values.Master.JenkinsUriPrefix }}</value>
                   </org.csanchez.jenkins.plugins.kubernetes.model.KeyValueEnvVar>
 {{- range $index, $envVar := $pod.EnvVars }}
                 <org.csanchez.jenkins.plugins.kubernetes.model.{{ $envVar.type }}EnvVar>