Skip to content

Add prePuller.[hook|continuous].daemonsetAnnotations config #3682

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.

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

Merged
merged 1 commit into from
May 30, 2025

Conversation

consideRatio
Copy link
Member

@consideRatio consideRatio commented May 30, 2025

I understand that annotating the DaemonSet is relevant for use with keel, and then the DaemonSet rather than the individual pods should be configured with annotations as examplified in https://keel.sh/docs/#additional-settings.

This PR provides the prePuller.[hook|continuous].daemonsetAnnotations config options to set annotations on the daemonset resources of the image pullers, as compared to setting them on the image puller pods (hook & continuous) which is already possible via prePuller.annotations.

Fixes #3674
Supercedes / closes #3675

Do you think this meet your needs @paololazzari?

Reasoning about the implementation

Config naming for the image puller mechanism is tricky as we have so multiple resources under the flag "image puller". We got the hook image awaiter Job and Pod, and the hook & continuous image puller DaemonSets and their Pods. Many Helm charts declares podAnnotations etc to clarify that the annotations influences the pod template rather than the owner resource (Deployment, DaemonSet, ...), but we have used just annotations, so I figure it makes sense to name this daemonsetAnnotations. I considered flat vs nested config structure (daemonsetAnnotations vs daemonset.annotations), but I think we should go flat.

@consideRatio consideRatio changed the title Add config for image-puller daemonsets' annotations Add prePuller.[hook|continuous].daemonsetAnnotations config May 30, 2025
@consideRatio consideRatio requested a review from manics May 30, 2025 07:59
@paololazzari
Copy link

Looks great, thank you!

@manics manics merged commit 163be9c into jupyterhub:main May 30, 2025
16 checks passed
consideRatio pushed a commit to jupyterhub/helm-chart that referenced this pull request May 30, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add extraAnnotations to continuous-image-puller
3 participants