Add modern labels alongside legacy labels to pods

Author: consideRatio

jupyterhub/templates/hub/deployment.yaml

@@ -18,7 +18,7 @@ spec:
     metadata:
       labels:
         {{- /* Changes here will cause the Deployment to restart the pods. */}}
-        {{- include "jupyterhub.labels" . | nindent 8 }}
+        {{- include "jupyterhub.matchLabelsLegacyAndModern" . | nindent 8 }}
         hub.jupyter.org/network-access-proxy-api: "true"
         hub.jupyter.org/network-access-proxy-http: "true"
         hub.jupyter.org/network-access-singleuser: "true"

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

@@ -40,7 +40,7 @@ spec:
   template:
     metadata:
       labels:
-        {{- include "jupyterhub.labels" . | nindent 8 }}
+        {{- include "jupyterhub.matchLabelsLegacyAndModern" . | nindent 8 }}
       {{- with .Values.prePuller.annotations }}
       annotations:
         {{- . | toYaml | nindent 8 }}

jupyterhub/templates/image-puller/job.yaml

@@ -27,7 +27,7 @@ spec:
     metadata:
       labels:
         {{- /* Changes here will cause the Job to restart the pods. */}}
-        {{- include "jupyterhub.labels" . | nindent 8 }}
+        {{- include "jupyterhub.matchLabelsLegacyAndModern" . | nindent 8 }}
         {{- with .Values.prePuller.labels }}
         {{- . | toYaml | nindent 8 }}
         {{- end }}

jupyterhub/templates/proxy/autohttps/deployment.yaml

@@ -18,7 +18,7 @@ spec:
   template:
     metadata:
       labels:
-        {{- include "jupyterhub.labels" . | nindent 8 }}
+        {{- include "jupyterhub.matchLabelsLegacyAndModern" . | nindent 8 }}
         hub.jupyter.org/network-access-proxy-http: "true"
         {{- with .Values.proxy.traefik.labels }}
         {{- . | toYaml | nindent 8 }}

jupyterhub/templates/proxy/deployment.yaml

@@ -20,7 +20,7 @@ spec:
     metadata:
       labels:
         {{- /* Changes here will cause the Deployment to restart the pods. */}}
-        {{- include "jupyterhub.labels" . | nindent 8 }}
+        {{- include "jupyterhub.matchLabelsLegacyAndModern" . | nindent 8 }}
         hub.jupyter.org/network-access-hub: "true"
         hub.jupyter.org/network-access-singleuser: "true"
         {{- with .Values.proxy.labels }}

jupyterhub/templates/scheduling/user-placeholder/statefulset.yaml

@@ -32,7 +32,7 @@ spec:
       {{- end }}
       labels:
         {{- /* Changes here will cause the Deployment to restart the pods. */}}
-        {{- include "jupyterhub.labels" . | nindent 8 }}
+        {{- include "jupyterhub.matchLabelsLegacyAndModern" . | nindent 8 }}
         {{- with .Values.scheduling.userPlaceholder.labels }}
         {{- . | toYaml | nindent 8 }}
         {{- end }}

jupyterhub/templates/scheduling/user-scheduler/deployment.yaml

@@ -16,7 +16,7 @@ spec:
   template:
     metadata:
       labels:
-        {{- include "jupyterhub.labels" . | nindent 8 }}
+        {{- include "jupyterhub.matchLabelsLegacyAndModern" . | nindent 8 }}
         {{- with .Values.scheduling.userScheduler.labels }}
         {{- . | toYaml | nindent 8 }}
         {{- end }}