diff --git a/jupyterhub/files/hub/jupyterhub_config.py b/jupyterhub/files/hub/jupyterhub_config.py index c117908918..41fe378f53 100644 --- a/jupyterhub/files/hub/jupyterhub_config.py +++ b/jupyterhub/files/hub/jupyterhub_config.py @@ -131,9 +131,6 @@ def camelCaseify(s): common_labels["helm.sh/chart"] = common_labels["chart"] = ( f"{chart_name}-{chart_version.replace('+', '_')}" ) -chart_app_version = get_config("Chart.AppVersion") -if chart_app_version: - common_labels["app.kubernetes.io/version"] = chart_app_version common_labels["app.kubernetes.io/managed-by"] = "kubespawner" c.KubeSpawner.namespace = os.environ.get("POD_NAMESPACE", "default") diff --git a/jupyterhub/templates/_helpers.tpl b/jupyterhub/templates/_helpers.tpl index 377006297e..18d74bdebe 100644 --- a/jupyterhub/templates/_helpers.tpl +++ b/jupyterhub/templates/_helpers.tpl @@ -119,7 +119,6 @@ heritage (omitted for matchLabels) Provides modern labels (omitted for matchLabels): app.kubernetes.io/name ("app") - app.kubernetes.io/version app.kubernetes.io/instance release ("release") helm.sh/chart ("chart") app.kubernetes.io/managed-by ("heritage") @@ -132,7 +131,6 @@ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ .appLabel | default (include "jupyterhub.appLabel" .) | quote }} app.kubernetes.io/instance: {{ .Release.Name | quote }} -app.kubernetes.io/version: {{ .Chart.AppVersion }} helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} app.kubernetes.io/managed-by: {{ .Release.Service }} {{- end }} @@ -150,7 +148,6 @@ app.kubernetes.io/managed-by: {{ .Release.Service }} Provides modern labels (omitted for matchLabels): app.kubernetes.io/component ("component") app.kubernetes.io/name ("app") - app.kubernetes.io/version app.kubernetes.io/instance release ("release") helm.sh/chart ("chart") app.kubernetes.io/managed-by ("heritage") diff --git a/tests/test_spawn.py b/tests/test_spawn.py index ab2b92bc1a..a20a2dc2b2 100644 --- a/tests/test_spawn.py +++ b/tests/test_spawn.py @@ -59,7 +59,6 @@ def test_spawn_basic( # with https://github.com/jupyterhub/kubespawner/pull/835. # assert pod_labels["app.kubernetes.io/component"] == "singleuser-server" assert pod_labels["helm.sh/chart"].startswith("jupyterhub-") - assert "app.kubernetes.io/version" in pod_labels assert pod_labels["app.kubernetes.io/managed-by"] == "kubespawner" # check for legacy labels still meant to be around