Compare commits
1 Commits
ee70ebae16
...
87d0d31b91
Author | SHA1 | Date |
---|---|---|
Fleur Kelpin | 87d0d31b91 |
|
@ -34,7 +34,7 @@ data:
|
||||||
<name>{{ $podName }}</name>
|
<name>{{ $podName }}</name>
|
||||||
<instanceCap>2147483647</instanceCap>
|
<instanceCap>2147483647</instanceCap>
|
||||||
<idleMinutes>0</idleMinutes>
|
<idleMinutes>0</idleMinutes>
|
||||||
<label>{{ $.Release.Name }}-{{ $pod.Label }}</label>
|
<label>{{ .Release.Name }}-{{ $pod.Label }}</label>
|
||||||
<nodeSelector>
|
<nodeSelector>
|
||||||
{{- $local := dict "first" true }}
|
{{- $local := dict "first" true }}
|
||||||
{{- range $key, $value := $pod.NodeSelector }}
|
{{- range $key, $value := $pod.NodeSelector }}
|
||||||
|
@ -75,23 +75,17 @@ data:
|
||||||
{{- else }}
|
{{- else }}
|
||||||
<ttyEnabled>false</ttyEnabled>
|
<ttyEnabled>false</ttyEnabled>
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if $container.resources }}
|
<resourceRequestCpu>{{ $container.resources.requests.cpu }}</resourceRequestCpu>
|
||||||
{{- if $container.resources.requests }}
|
<resourceRequestMemory>{{ $container.resources.requests.memory }}</resourceRequestMemory>
|
||||||
<resourceRequestCpu>{{ $container.resources.requests.cpu | default "" }}</resourceRequestCpu>
|
<resourceLimitCpu>{{ $container.resources.limits.cpu }}</resourceLimitCpu>
|
||||||
<resourceRequestMemory>{{ $container.resources.requests.memory | default "" }}</resourceRequestMemory>
|
<resourceLimitMemory>{{ $container.resources.limits.memory }}</resourceLimitMemory>
|
||||||
{{- 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>
|
</org.csanchez.jenkins.plugins.kubernetes.ContainerTemplate>
|
||||||
{{- end }}
|
{{- end }}
|
||||||
</containers>
|
</containers>
|
||||||
<envVars>
|
<envVars>
|
||||||
<org.csanchez.jenkins.plugins.kubernetes.model.KeyValueEnvVar>
|
<org.csanchez.jenkins.plugins.kubernetes.model.KeyValueEnvVar>
|
||||||
<key>JENKINS_URL</key>
|
<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>
|
</org.csanchez.jenkins.plugins.kubernetes.model.KeyValueEnvVar>
|
||||||
{{- range $index, $envVar := $pod.EnvVars }}
|
{{- range $index, $envVar := $pod.EnvVars }}
|
||||||
<org.csanchez.jenkins.plugins.kubernetes.model.{{ $envVar.type }}EnvVar>
|
<org.csanchez.jenkins.plugins.kubernetes.model.{{ $envVar.type }}EnvVar>
|
||||||
|
|
Loading…
Reference in New Issue