Merge pull request #612 from zv0n/main

Add user_namespace_labels and user_namespace_annotations for use with enable_user_namespaces

kubespawner/spawner.py

@@ -324,6 +324,40 @@ async def async_method(self, *args, **kwargs):
         """,
     )
 
+    user_namespace_labels = Dict(
+        config=True,
+        help="""
+        Kubernetes labels that user namespaces will get (only if
+        enable_user_namespaces is True).
+
+        Note that these are only set when the namespaces are created, not
+        later when this setting is updated.
+
+        `{username}`, `{userid}`, `{servername}`, `{hubnamespace}`,
+        `{unescaped_username}`, and `{unescaped_servername}` will be expanded if
+        found within strings of this configuration. The username and servername
+        come escaped to follow the [DNS label
+        standard](https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#dns-label-names).
+        """,
+    )
+
+    user_namespace_annotations = Dict(
+        config=True,
+        help="""
+        Kubernetes annotations that user namespaces will get (only if
+        enable_user_namespaces is True).
+
+        Note that these are only set when the namespaces are created, not
+        later when this setting is updated.
+
+        `{username}`, `{userid}`, `{servername}`, `{hubnamespace}`,
+        `{unescaped_username}`, and `{unescaped_servername}` will be expanded if
+        found within strings of this configuration. The username and servername
+        come escaped to follow the [DNS label
+        standard](https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#dns-label-names).
+        """,
+    )
+
     user_namespace_template = Unicode(
         "{hubnamespace}-{username}",
         config=True,
@@ -3010,7 +3044,11 @@ async def load_user_options(self):
             )
 
     async def _ensure_namespace(self):
-        ns = make_namespace(self.namespace)
+        ns = make_namespace(
+            self.namespace,
+            labels=self._expand_all(self.user_namespace_labels),
+            annotations=self._expand_all(self.user_namespace_annotations),
+        )
         api = self.api
         try:
             await asyncio.wait_for(