Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

prePuller.extraTolerations added for the image-puller daemonsets #1883

Merged
merged 5 commits into from
Nov 3, 2020
Merged

prePuller.extraTolerations added for the image-puller daemonsets #1883

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1722fed
Bump oauthenticator to 0.12.0 from 0.11.0
consideRatio Oct 26, 2020
4ffcdec
Add extra tolerations to prePuller
Oct 20, 2020
492ada7
Merge remote-tracking branch 'realjupyter/master' into prepullertoler…
jerkern Oct 28, 2020
8293863
PR comments prePuller.extraTolerations
Oct 28, 2020
5783e82
fix helm error
Nov 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jupyterhub/schema.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1406,6 +1406,7 @@ properties:

They were made configurable as usage of ResourceQuota may require
containers in the namespace to have explicit resources set.
extraTolerations: *tolerations-spec
hook:
description: |
See the [*optimization
Expand Down Expand Up @@ -1433,7 +1434,6 @@ properties:
0.9.0 and earlier.
type: int
nodeSelector: *nodeSelector-spec
tolerations: *tolerations-spec
continuous:
description: |
See the [*optimization
Expand Down
3 changes: 3 additions & 0 deletions jupyterhub/templates/image-puller/_daemonset-helper.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ spec:
{{- end }}
tolerations:
{{- include "jupyterhub.userTolerations" . | nindent 8 }}
{{- if .Values.prePuller.extraTolerations }}
{{- .Values.prePuller.extraTolerations | toYaml | trimSuffix "\n" | nindent 8 }}
{{- end }}
consideRatio marked this conversation as resolved.
Show resolved Hide resolved
nodeSelector: {{ toJson .Values.singleuser.nodeSelector }}
{{- if include "jupyterhub.userNodeAffinityRequired" . }}
affinity:
Expand Down
2 changes: 1 addition & 1 deletion jupyterhub/templates/image-puller/job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
{{- if .Values.rbac.enabled }}
serviceAccountName: hook-image-awaiter
{{- end }}
tolerations: {{ toJson .Values.prePuller.hook.tolerations }}
tolerations: {{ toJson .Values.prePuller.extraTolerations }}
nodeSelector: {{ toJson .Values.prePuller.hook.nodeSelector }}
{{- with include "jupyterhub.imagePullSecrets" (dict "root" . "image" .Values.prePuller.hook.image) }}
imagePullSecrets: {{ . }}
Expand Down
2 changes: 1 addition & 1 deletion jupyterhub/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,7 @@ prePuller:
runAsUser: 65534 # nobody user
runAsGroup: 65534 # nobody group
allowPrivilegeEscalation: false
extraTolerations: []
# hook relates to the hook-image-awaiter Job and hook-image-puller DaemonSet
hook:
enabled: true
Expand All @@ -480,7 +481,6 @@ prePuller:
allowPrivilegeEscalation: false
podSchedulingWaitDuration: 10
nodeSelector: {}
tolerations: []
consideRatio marked this conversation as resolved.
Show resolved Hide resolved
continuous:
enabled: true
pullProfileListImages: true
Expand Down