Revert introduction of app.kubernetes.io/version label

jupyterhub · May 6, 2024 · 5099dfc · 5099dfc
1 parent 2f8d0f8
commit 5099dfc
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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