Merge pull request #3682 from consideRatio/pr/dsann

Add `prePuller.[hook|continuous].daemonsetAnnotations` config

Author: manics

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

@@ -25,6 +25,14 @@ metadata:
     "helm.sh/hook": pre-install,pre-upgrade
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
     "helm.sh/hook-weight": "-10"
+    {{- with .Values.prePuller.hook.daemonsetAnnotations }}
+    {{- . | toYaml | nindent 4 }}
+    {{- end }}
+  {{- else }}
+  {{- with .Values.prePuller.continuous.daemonsetAnnotations }}
+  annotations:
+    {{- . | toYaml | nindent 4 }}
+  {{- end }}
   {{- end }}
 spec:
   selector:

jupyterhub/values.schema.yaml

@@ -2906,6 +2906,12 @@ properties:
           resources: *resources-spec
           serviceAccount: *serviceAccount
           serviceAccountImagePuller: *serviceAccount
+          daemonsetAnnotations:
+            type: object
+            additionalProperties: false
+            patternProperties: *labels-and-annotations-patternProperties
+            description: |
+              Annotations to apply to the hook image puller DaemonSet.
       continuous:
         type: object
         additionalProperties: false
@@ -2923,6 +2929,12 @@ properties:
           enabled:
             type: boolean
           serviceAccount: *serviceAccount
+          daemonsetAnnotations:
+            type: object
+            additionalProperties: false
+            patternProperties: *labels-and-annotations-patternProperties
+            description: |
+              Annotations to apply to the continuous image puller DaemonSet.
       pullProfileListImages:
         type: boolean
         description: |

jupyterhub/values.yaml

@@ -675,12 +675,14 @@ prePuller:
       create: true
       name:
       annotations: {}
+    daemonsetAnnotations: {}
   continuous:
     enabled: true
     serviceAccount:
       create: true
       name:
       annotations: {}
+    daemonsetAnnotations: {}
   pullProfileListImages: true
   extraImages: {}
   pause:

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

@@ -564,9 +564,11 @@ prePuller:
         effect: NoSchedule
     serviceAccount: *serviceAccount
     serviceAccountImagePuller: *serviceAccount
+    daemonsetAnnotations: *annotations
   continuous:
     enabled: true
     serviceAccount: *serviceAccount
+    daemonsetAnnotations: *annotations
   extraImages:
     mockImage1:
       name: mock-user/mock-image1