diff --git a/molgenis-jenkins/templates/config.tpl b/molgenis-jenkins/templates/config.tpl index 67204ce..5526fce 100644 --- a/molgenis-jenkins/templates/config.tpl +++ b/molgenis-jenkins/templates/config.tpl @@ -34,53 +34,53 @@ data: {{ $podName }} 2147483647 0 - + {{- $local := dict "first" true }} - {{- range $key, $value := $pod.NodeSelector }} + {{- range $key, $value := .NodeSelector }} {{- if not $local.first }},{{- end }} {{- $key }}={{ $value }} {{- $_ := set $local "first" false }} {{- end }} - $pod.NodeUsageMode + .NodeUsageMode -{{- range $index, $volume := $pod.volumes }} - +{{- range $index, $volume := .volumes }} + {{- range $key, $value := $volume }}{{- if not (eq $key "type") }} <{{ $key }}>{{ $value }} {{- end }}{{- end }} - + {{- end }} -{{- range $containerName, $container := $pod.Containers }} +{{- range $containerName, $container := .Containers }} {{ $containerName }} - {{ $container.Image }}:{{ $container.ImageTag | default "latest" }} -{{- if $container.Privileged }} + {{ .Image }}:{{ .ImageTag | default "latest" }} +{{- if .Privileged }} true {{- else }} false {{- end }} -{{- if $container.AlwaysPullImage }} +{{- if .AlwaysPullImage }} true {{- else }} false {{- end }} /home/jenkins - {{ $container.Command | default "cat" }} - {{ $container.Args | default "" }} -{{- if $container.TTY }} + {{ .Command | default "cat" }} + {{ .Args | default "" }} +{{- if .TTY }} true {{- else }} false {{- end }} -{{- if $container.resources }} -{{- if $container.resources.requests }} +{{- if .resources }} +{{- if .resources.requests }} {{ $container.resources.requests.cpu | default "" }} {{ $container.resources.requests.memory | default "" }} {{- end }} -{{- if $container.resources.limits }} +{{- if .resources.limits }} {{ $container.resources.limits.cpu | default "" }} {{ $container.resources.limits.memory | default "" }} {{- end }} @@ -93,19 +93,19 @@ data: JENKINS_URL http://{{ template "jenkins.fullname" $ }}:{{$.Values.Master.ServicePort}}{{ default "" $.Values.Master.JenkinsUriPrefix }} -{{- range $index, $envVar := $pod.EnvVars }} - +{{- range $index, $envVar := .EnvVars }} + {{- range $key, $value := $envVar }}{{- if not (eq $key "type") }} <{{ $key }}>{{ $value }} {{- end }}{{- end }} - + {{- end }} -{{- if $pod.ImagePullSecret }} +{{- if .ImagePullSecret }} - {{ $pod.ImagePullSecret }} + {{ .ImagePullSecret }} {{- else }}