Skip to content

Commit 163be9c

Browse files
authored
Merge pull request #3682 from consideRatio/pr/dsann
Add `prePuller.[hook|continuous].daemonsetAnnotations` config
2 parents 6cadee8 + 4dbd901 commit 163be9c

File tree

4 files changed

+24
-0
lines changed

4 files changed

+24
-0
lines changed

jupyterhub/templates/image-puller/_helpers-daemonset.tpl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,14 @@ metadata:
2525
"helm.sh/hook": pre-install,pre-upgrade
2626
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
2727
"helm.sh/hook-weight": "-10"
28+
{{- with .Values.prePuller.hook.daemonsetAnnotations }}
29+
{{- . | toYaml | nindent 4 }}
30+
{{- end }}
31+
{{- else }}
32+
{{- with .Values.prePuller.continuous.daemonsetAnnotations }}
33+
annotations:
34+
{{- . | toYaml | nindent 4 }}
35+
{{- end }}
2836
{{- end }}
2937
spec:
3038
selector:

jupyterhub/values.schema.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2906,6 +2906,12 @@ properties:
29062906
resources: *resources-spec
29072907
serviceAccount: *serviceAccount
29082908
serviceAccountImagePuller: *serviceAccount
2909+
daemonsetAnnotations:
2910+
type: object
2911+
additionalProperties: false
2912+
patternProperties: *labels-and-annotations-patternProperties
2913+
description: |
2914+
Annotations to apply to the hook image puller DaemonSet.
29092915
continuous:
29102916
type: object
29112917
additionalProperties: false
@@ -2923,6 +2929,12 @@ properties:
29232929
enabled:
29242930
type: boolean
29252931
serviceAccount: *serviceAccount
2932+
daemonsetAnnotations:
2933+
type: object
2934+
additionalProperties: false
2935+
patternProperties: *labels-and-annotations-patternProperties
2936+
description: |
2937+
Annotations to apply to the continuous image puller DaemonSet.
29262938
pullProfileListImages:
29272939
type: boolean
29282940
description: |

jupyterhub/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -675,12 +675,14 @@ prePuller:
675675
create: true
676676
name:
677677
annotations: {}
678+
daemonsetAnnotations: {}
678679
continuous:
679680
enabled: true
680681
serviceAccount:
681682
create: true
682683
name:
683684
annotations: {}
685+
daemonsetAnnotations: {}
684686
pullProfileListImages: true
685687
extraImages: {}
686688
pause:

tools/templates/lint-and-validate-values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -564,9 +564,11 @@ prePuller:
564564
effect: NoSchedule
565565
serviceAccount: *serviceAccount
566566
serviceAccountImagePuller: *serviceAccount
567+
daemonsetAnnotations: *annotations
567568
continuous:
568569
enabled: true
569570
serviceAccount: *serviceAccount
571+
daemonsetAnnotations: *annotations
570572
extraImages:
571573
mockImage1:
572574
name: mock-user/mock-image1

0 commit comments

Comments
 (0)