Skip to content

Commit

Permalink
fix: accept user-placeholder resources
Browse files Browse the repository at this point in the history
  • Loading branch information
consideRatio committed Feb 17, 2021
1 parent b76335a commit 6c2a38a
Showing 1 changed file with 4 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,11 @@ spec:
- name: pause
image: {{ .Values.prePuller.pause.image.name }}:{{ .Values.prePuller.pause.image.tag }}
resources:
# FIXME: should render scheduling.userPlaceholder.resources if specified
{{- if .Values.scheduling.userPlaceholder.resources }}
{{- .Values.scheduling.userPlaceholder.resources | toYaml | trimSuffix "\n" | nindent 12 }}
{{- else }}
{{- include "jupyterhub.resources" . | nindent 12 }}
{{- end }}
{{- with .Values.scheduling.userPlaceholder.containerSecurityContext }}
securityContext:
{{- . | toYaml | trimSuffix "\n" | nindent 12 }}
Expand Down

0 comments on commit 6c2a38a

Please sign in to comment.