Put servername only on pod

Author: yuvipanda

kubespawner/spawner.py

@@ -2168,7 +2168,6 @@ def _build_common_annotations(self, extra_annotations):
         # Annotations don't need to be escaped
         annotations = {
             'hub.jupyter.org/username': self.user.name,
-            'hub.jupyter.org/servername': self.name,
             "hub.jupyter.org/kubespawner-version": __version__,
             "hub.jupyter.org/jupyterhub-version": jupyterhub.__version__
         }
@@ -2286,6 +2285,8 @@ async def get_pod_manifest(self):
         annotations = self._build_common_annotations(
             self._expand_all(self.extra_annotations)
         )
+        # Unconditionally put servername on the pods
+        annotations['hub.jupyter.org/servername'] = self.name
 
         return make_pod(
             name=self.pod_name,