Add content job template default requests and limits #634
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -88,6 +88,10 @@ spec: | |
| {{- if or $templateData.pod.serviceAccountName .Job.serviceAccountName }} | ||
| serviceAccountName: {{ .Job.serviceAccountName | default $templateData.pod.serviceAccountName | quote }} | ||
| {{- end }} | ||
| {{- with $templateData.pod.hostAliases }} | ||
| hostAliases: | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
|
There was a problem hiding this comment. FYI @samcofer I noticed while working on this PR that we forgot to add the hostAliases setting to the helm chart's job template version. Sorry about that, I'll try to remember to update those templates going forward |
||
| shareProcessNamespace: {{ .Job.shareProcessNamespace }} | ||
| {{- if or (ne (len .Job.volumes) 0) (ne (len $templateData.pod.volumes) 0) }} | ||
| volumes: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,296 @@ | ||
| # Version: 2.4.0 | ||
| # DO NOT MODIFY the "Version: " key | ||
| # Helm Version: v2 | ||
| {{- $templateData := include "rstudio-library.templates.data" nil | mustFromJson }} | ||
| apiVersion: batch/v1 | ||
| kind: Job | ||
| metadata: | ||
| annotations: | ||
| {{- with .Job.metadata.job.annotations }} | ||
| {{- range $key, $val := . }} | ||
| {{ $key }}: {{ toYaml $val | indent 4 | trimPrefix (repeat 4 " ") }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- with $templateData.job.annotations }} | ||
| {{- range $key, $val := . }} | ||
| {{ $key }}: {{ toYaml $val | indent 4 | trimPrefix (repeat 4 " ") }} | ||
| {{- end }} | ||
| {{- end }} | ||
| labels: | ||
| app.kubernetes.io/managed-by: "launcher" | ||
| {{- with .Job.instanceId }} | ||
| launcher-instance-id: {{ toYaml . }} | ||
| {{- end }} | ||
| {{- with .Job.metadata.job.labels }} | ||
| {{- range $key, $val := . }} | ||
| {{ $key }}: {{ toYaml $val | indent 4 | trimPrefix (repeat 4 " ") }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- with $templateData.job.labels }} | ||
| {{- range $key, $val := . }} | ||
| {{ $key }}: {{ toYaml $val | indent 4 | trimPrefix (repeat 4 " ") }} | ||
| {{- end }} | ||
| {{- end }} | ||
| generateName: {{ toYaml .Job.generateName }} | ||
| spec: | ||
| {{- if $templateData.job.ttlSecondsAfterFinished }} | ||
| ttlSecondsAfterFinished: {{ $templateData.job.ttlSecondsAfterFinished }} | ||
| {{- end }} | ||
| backoffLimit: 0 | ||
| template: | ||
| metadata: | ||
| annotations: | ||
| {{- if .Job.tags }} | ||
| {{- $i := 0 }} | ||
| {{- range .Job.tags }} | ||
| USER_TAG_{{ $i }}: {{ toYaml . | indent 8 | trimPrefix (repeat 8 " ") }} | ||
| {{- $i = add $i 1 }} | ||
| {{- end }} | ||
| {{- end }} | ||
| stdin: {{ toYaml .Job.stdin | indent 8 | trimPrefix (repeat 8 " ") }} | ||
| user: {{ toYaml .Job.user }} | ||
| name: {{ toYaml .Job.name }} | ||
| service_ports: {{ toYaml .Job.servicePortsJson }} | ||
| {{- if .Job.metadata }} | ||
| user_metadata: {{ toJson .Job.metadata | toYaml | indent 8 | trimPrefix (repeat 8 " ") }} | ||
| {{- end }} | ||
| {{- with .Job.metadata.pod.annotations }} | ||
| {{- range $key, $val := . }} | ||
| {{ $key }}: {{ toYaml $val | indent 8 | trimPrefix (repeat 8 " ") }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- with $templateData.pod.annotations }} | ||
| {{- range $key, $val := . }} | ||
| {{ $key }}: {{ toYaml $val | indent 8 | trimPrefix (repeat 8 " ") }} | ||
| {{- end }} | ||
| {{- end }} | ||
| labels: | ||
| {{- with .Job.instanceId }} | ||
| launcher-instance-id: {{ toYaml . }} | ||
| {{- end }} | ||
| {{- with .Job.metadata.pod.labels }} | ||
| {{- range $key, $val := . }} | ||
| {{ $key }}: {{ toYaml $val | indent 8 | trimPrefix (repeat 8 " ") }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- with $templateData.pod.labels }} | ||
| {{- range $key, $val := . }} | ||
| {{ $key }}: {{ toYaml $val | indent 8 | trimPrefix (repeat 8 " ") }} | ||
| {{- end }} | ||
| {{- end }} | ||
| generateName: {{ toYaml .Job.generateName }} | ||
| spec: | ||
| {{- if .Job.host }} | ||
| nodeName: {{ toYaml .Job.host }} | ||
| {{- end }} | ||
| enableServiceLinks: {{ if hasKey $templateData.pod "enableServiceLinks" }}{{ $templateData.pod.enableServiceLinks }}{{ else }}false{{ end }} | ||
| restartPolicy: Never | ||
| {{- if or $templateData.pod.serviceAccountName .Job.serviceAccountName }} | ||
| serviceAccountName: {{ .Job.serviceAccountName | default $templateData.pod.serviceAccountName | quote }} | ||
| {{- end }} | ||
| {{- with $templateData.pod.hostAliases }} | ||
| hostAliases: | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| shareProcessNamespace: {{ .Job.shareProcessNamespace }} | ||
| {{- if or (ne (len .Job.volumes) 0) (ne (len $templateData.pod.volumes) 0) }} | ||
| volumes: | ||
| {{- range .Job.volumes }} | ||
| - {{ nindent 10 (toYaml .) | trim -}} | ||
| {{- end }} | ||
| {{- range $templateData.pod.volumes }} | ||
| - {{ nindent 10 (toYaml .) | trim -}} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- with $templateData.pod.tolerations }} | ||
| tolerations: | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| {{- with $templateData.pod.affinity }} | ||
| affinity: | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| {{- if or (ne (len .Job.placementConstraints) 0) (and $templateData.pod.nodeSelector (ne (len $templateData.pod.nodeSelector) 0)) }} | ||
| nodeSelector: | ||
| {{- range .Job.placementConstraints }} | ||
| {{ .name }}: {{ toYaml .value }} | ||
| {{- end }} | ||
| {{- range $key,$val := $templateData.pod.nodeSelector }} | ||
| {{ $key }}: {{- toYaml $val | nindent 10 }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- with $templateData.pod.priorityClassName }} | ||
| priorityClassName: | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| {{- $securityContext := $templateData.pod.defaultSecurityContext }} | ||
| {{- if .Job.container.runAsUserId }} | ||
| {{- $_ := set $securityContext "runAsUser" .Job.container.runAsUserId }} | ||
| {{- end }} | ||
| {{- if .Job.container.runAsGroupId }} | ||
| {{- $_ := set $securityContext "runAsGroup" .Job.container.runAsGroupId }} | ||
| {{- end }} | ||
| {{- if .Job.container.supplementalGroupIds }} | ||
| {{- $groupIds := list }} | ||
| {{- range .Job.container.supplementalGroupIds }} | ||
| {{- $groupIds = append $groupIds . }} | ||
| {{- end }} | ||
| {{- $_ := set $securityContext "supplementalGroups" (cat "[" ($groupIds | join ", ") "]") }} | ||
| {{- $securityContext := mergeOverwrite $securityContext $templateData.pod.securityContext }} | ||
| {{- end }} | ||
| {{- if $securityContext }} | ||
| securityContext: | ||
| {{- range $key, $val := $securityContext }} | ||
| {{ $key }}: {{ $val }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- with $templateData.pod.imagePullSecrets }} | ||
| imagePullSecrets: {{ toYaml . | nindent 12 }} | ||
| {{- end }} | ||
| initContainers: | ||
| {{- with .Job.metadata.pod.initContainers }} | ||
| {{- range . }} | ||
| - {{ toYaml . | indent 10 | trimPrefix (repeat 10 " ") }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- with $templateData.pod.initContainers }} | ||
| {{- range . }} | ||
| - {{ toYaml . | indent 10 | trimPrefix (repeat 10 " ") }} | ||
| {{- end }} | ||
| {{- end }} | ||
| containers: | ||
| - name: rs-launcher-container | ||
| image: {{ toYaml .Job.container.image }} | ||
| {{- with $templateData.pod.imagePullPolicy }} | ||
| imagePullPolicy: {{- . | nindent 12 }} | ||
| {{- end }} | ||
| {{- $isShell := false }} | ||
| {{- if $templateData.pod.command }} | ||
| command: {{- toYaml $templateData.pod.command | nindent 12 }} | ||
| {{- if .Job.command }}{{- $isShell = true }}{{- end }} | ||
| {{- else if .Job.command }} | ||
| command: ['/bin/sh'] | ||
| {{- $isShell = true }} | ||
| {{- else }} | ||
| command: [{{ toYaml .Job.exe }}] | ||
| {{- $isShell = false }} | ||
| {{- end }} | ||
| {{- if .Job.stdin }} | ||
| stdin: true | ||
| {{- else }} | ||
| stdin: false | ||
| {{- end }} | ||
| stdinOnce: true | ||
| {{- if .Job.workingDirectory }} | ||
| workingDir: {{ toYaml .Job.workingDirectory }} | ||
| {{- end }} | ||
| {{- if or (ne (len .Job.args) 0) $isShell }} | ||
| args: | ||
| {{- if $isShell }} | ||
| - '-c' | ||
| {{- if ne (len .Job.args) 0 }} | ||
| - {{ .Job.args | join " " | cat .Job.command | toYaml | indent 12 | trimPrefix (repeat 12 " ") }} | ||
| {{- else }} | ||
| - {{ .Job.command | toYaml | indent 12 | trimPrefix (repeat 12 " ") }} | ||
| {{- end }} | ||
| {{- else }} | ||
| {{- range .Job.args }} | ||
| - {{ toYaml . | indent 12 | trimPrefix (repeat 12 " ") }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- $secrets := list }} | ||
| {{- range .Job.config }} | ||
| {{- if eq .name "secret" }} | ||
| {{- $packedSecret := .value }} | ||
| {{- $secret := dict }} | ||
| {{- $_ := set $secret "secret" (splitList ":" $packedSecret | first) }} | ||
| {{- $_ := set $secret "key" (slice (splitList ":" $packedSecret) 1 2 | first) }} | ||
| {{- $_ := set $secret "name" (splitList ":" $packedSecret | last) }} | ||
| {{- $secrets = append $secrets $secret }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- if or (ne (len .Job.environment) 0) (ne (len $secrets) 0) (ne (len $templateData.pod.env) 0) }} | ||
| env: | ||
| {{- range .Job.environment }} | ||
| - name: {{ toYaml .name | indent 14 | trimPrefix (repeat 14 " ") }} | ||
| value: {{ toYaml .value | indent 14 | trimPrefix (repeat 14 " ") }} | ||
| {{- end }} | ||
| {{- range $secrets }} | ||
| - name: {{ get . "name"}} | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: {{ get . "secret" }} | ||
| key: {{ get . "key" }} | ||
| {{- end }} | ||
| {{- if $templateData.pod.env }} | ||
| {{- toYaml $templateData.pod.env | nindent 12 }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- with $templateData.pod.containerSecurityContext }} | ||
| securityContext: | ||
| {{- toYaml . | nindent 12 }} | ||
| {{- end }} | ||
| {{- $exposedPorts := list }} | ||
| {{- range .Job.exposedPorts }} | ||
| {{- if .publishedPort }} | ||
| {{- $exposedPorts = append $exposedPorts . }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- if ne (len $exposedPorts) 0 }} | ||
| ports: | ||
| {{- range $exposedPorts }} | ||
| - containerPort: {{ .targetPort }} | ||
| hostPort: {{ .publishedPort }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- $limits := $templateData.pod.resources.limits }} | ||
| {{- $requests := $templateData.pod.resources.requests }} | ||
| {{- range .Job.resourceLimits }} | ||
| {{- if eq .type "cpuCount" }} | ||
| {{- $_ := set $limits "cpu" .value }} | ||
| {{- else if eq .type "CPU Request" }} | ||
| {{- $_ := set $requests "cpu" .value }} | ||
| {{- else if eq .type "memory" }} | ||
| {{- $_ := set $limits "memory" (printf "%s%s" .value "M") }} | ||
| {{- else if eq .type "Memory Request" }} | ||
| {{- $_ := set $requests "memory" (printf "%s%s" .value "M") }} | ||
| {{- else if eq .type "NVIDIA GPUs" }} | ||
| {{- $val := float64 .value }} | ||
| {{- if ne $val 0.0 }} | ||
| {{- $_ := set $limits "nvidia.com/gpu" $val }} | ||
| {{- end }} | ||
| {{- else if eq .type "AMD GPUs" }} | ||
| {{- $val := float64 .value }} | ||
| {{- if ne $val 0.0 }} | ||
| {{- $_ := set $limits "amd.com/gpu" $val }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- if any (ne (len $requests) 0) (ne (len $limits) 0) }} | ||
| resources: | ||
| {{- if ne (len $requests) 0 }} | ||
| requests: | ||
| {{- range $key, $val := $requests }} | ||
| {{ $key }}: {{ toYaml $val }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- if ne (len $limits) 0 }} | ||
| limits: | ||
| {{- range $key, $val := $limits }} | ||
| {{ $key }}: {{ toYaml $val }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- if or (ne (len .Job.volumes) 0) (ne (len $templateData.pod.volumeMounts) 0) }} | ||
| volumeMounts: | ||
| {{- range .Job.volumeMounts }} | ||
| - {{ nindent 14 (toYaml .) | trim -}} | ||
| {{- end }} | ||
| {{- range $templateData.pod.volumeMounts }} | ||
| - {{ nindent 14 (toYaml .) | trim -}} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- with $templateData.pod.extraContainers }} | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need to provide empty dictionaries by default for
requestsandlimits?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch!