Unconditionally put servername in annotations #887
+7
−5
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Collaborator
yuvipanda
commented
Apr 7, 2025
yuvipanda
commented
- Matches behavior of what we do with servername in labels
- Labels are escaped while annotations are not, making annotations suitable for filtering in metrics and dashboards
- Matches behavior of what we do with servername in labels - Labels are escaped while annotations are not, making annotations suitable for filtering in metrics and dashboards
for more information, see https://pre-commit.ci
minrk
approved these changes
Apr 9, 2025
consideRatio
reviewed
Apr 9, 2025
Comment on lines
2285
to
+2289
| annotations = self._build_common_annotations( | ||
| self._expand_all(self.extra_annotations) | ||
| ) | ||
| # Unconditionally put servername on the pods | ||
| annotations['hub.jupyter.org/servername'] = self.name |
There was a problem hiding this comment.
It looks like the unconditional assignment following right after calling _build_common_annotations should only be relevant if self.extra_annotations were declaring another hub.jupyter.org/servername, which would have a blank string value or similar.
annotations = self._build_common_annotations(
self._expand_all(self.extra_annotations)
)
# Unconditionally put servername on the pods
annotations['hub.jupyter.org/servername'] = self.nameI wonder if its really a kubespawner issue, or z2jh / end-user issue based on this.
consideRatio
reviewed
Apr 9, 2025
Comment on lines
-2169
to
+2173
| annotations = {'hub.jupyter.org/username': self.user.name} | ||
| if self.name: | ||
| annotations['hub.jupyter.org/servername'] = self.name | ||
| annotations["hub.jupyter.org/kubespawner-version"] = __version__ | ||
| annotations["hub.jupyter.org/jupyterhub-version"] = jupyterhub.__version__ | ||
| annotations = { | ||
| 'hub.jupyter.org/username': self.user.name, | ||
| "hub.jupyter.org/kubespawner-version": __version__, | ||
| "hub.jupyter.org/jupyterhub-version": jupyterhub.__version__, | ||
| } |
There was a problem hiding this comment.
With this change we wouldn't get the servername annotation on PVCs etc
There was a problem hiding this comment.
PVCs are complicated because the template can be changed to create a shared or unshared volume.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.