Skip to content

Commit

Permalink
Reduce complexity of test labels
Browse files Browse the repository at this point in the history
  • Loading branch information
@consideRatio
consideRatio committed Apr 24, 2024
1 parent 65adeae commit cc51183
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 73 deletions.
4 changes: 4 additions & 0 deletions kubespawner/proxy.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,10 @@ def _namespace_default(self):
{
'app.kubernetes.io/name': 'jupyterhub',
'app.kubernetes.io/managed-by': 'kubespawner',
# app and heritage are older variants of the modern
# app.kubernetes.io labels
'app': 'jupyterhub',
'heritage': 'jupyterhub',
},
config=True,
help="""
Expand Down
4 changes: 4 additions & 0 deletions kubespawner/spawner.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -660,6 +660,10 @@ def _deprecated_changed(self, change):
{
'app.kubernetes.io/name': 'jupyterhub',
'app.kubernetes.io/managed-by': 'kubespawner',
# app and heritage are older variants of the modern
# app.kubernetes.io labels
'app': 'jupyterhub',
'heritage': 'jupyterhub',
},
config=True,
help="""
Expand Down
100 changes: 27 additions & 73 deletions tests/test_objects.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1986,9 +1986,7 @@ def test_make_ingress_for_ip(reuse_existing_services, target, ip):
Test specification of the ingress objects
"""
common_labels = {
'app.kubernetes.io/name': 'jupyterhub',
'app.kubernetes.io/managed-by': 'kubespawner',
'component': 'singleuser-server',
'common/label': 'value0',
}
ingress_extra_labels = {
'extra/label': 'value1',
Expand Down Expand Up @@ -2020,9 +2018,7 @@ def test_make_ingress_for_ip(reuse_existing_services, target, ip):
'hub.jupyter.org/proxy-target': target,
},
'labels': {
'app.kubernetes.io/name': 'jupyterhub',
'app.kubernetes.io/managed-by': 'kubespawner',
'component': 'singleuser-server',
'common/label': 'value0',
'hub.jupyter.org/proxy-route': 'true',
},
'name': 'jupyter-test',
Expand All @@ -2039,9 +2035,7 @@ def test_make_ingress_for_ip(reuse_existing_services, target, ip):
'hub.jupyter.org/proxy-target': target,
},
'labels': {
'app.kubernetes.io/name': 'jupyterhub',
'app.kubernetes.io/managed-by': 'kubespawner',
'component': 'singleuser-server',
'common/label': 'value0',
'hub.jupyter.org/proxy-route': 'true',
},
'name': 'jupyter-test',
Expand All @@ -2062,9 +2056,7 @@ def test_make_ingress_for_ip(reuse_existing_services, target, ip):
'extra/annotation': 'value2',
},
'labels': {
'app.kubernetes.io/name': 'jupyterhub',
'app.kubernetes.io/managed-by': 'kubespawner',
'component': 'singleuser-server',
'common/label': 'value0',
'hub.jupyter.org/proxy-route': 'true',
'extra/label': 'value1',
},
Expand Down Expand Up @@ -2112,8 +2104,7 @@ def test_make_ingress_for_service_reuse_existing_services_enabled(target):
leads to reusing the same service which was created by KubeSpawner
"""
common_labels = {
'app.kubernetes.io/managed-by': 'kubespawner',
'component': 'singleuser-server',
'common/label': 'value0',
}
endpoint, service, ingress = api_client.sanitize_for_serialization(
make_ingress(
Expand All @@ -2139,8 +2130,7 @@ def test_make_ingress_for_service_reuse_existing_services_enabled(target):
'hub.jupyter.org/proxy-target': target,
},
'labels': {
'component': 'singleuser-server',
'app.kubernetes.io/managed-by': 'kubespawner',
'common/label': 'value0',
'hub.jupyter.org/proxy-route': 'true',
},
'name': 'jupyter-test',
Expand Down Expand Up @@ -2201,8 +2191,7 @@ def test_make_ingress_for_service_reuse_existing_services_disabled(
leads to creating service with type External name pointing to the pod's service
"""
common_labels = {
'app.kubernetes.io/managed-by': 'kubespawner',
'component': 'singleuser-server',
'common/label': 'value0',
}
endpoint, service, ingress = api_client.sanitize_for_serialization(
make_ingress(
Expand All @@ -2227,8 +2216,7 @@ def test_make_ingress_for_service_reuse_existing_services_disabled(
'hub.jupyter.org/proxy-target': target,
},
'labels': {
'component': 'singleuser-server',
'app.kubernetes.io/managed-by': 'kubespawner',
'common/label': 'value0',
'hub.jupyter.org/proxy-route': 'true',
},
'name': 'jupyter-test',
Expand All @@ -2250,8 +2238,7 @@ def test_make_ingress_for_service_reuse_existing_services_disabled(
'hub.jupyter.org/proxy-target': target,
},
'labels': {
'component': 'singleuser-server',
'app.kubernetes.io/managed-by': 'kubespawner',
'common/label': 'value0',
'hub.jupyter.org/proxy-route': 'true',
},
'name': 'jupyter-test',
Expand Down Expand Up @@ -2315,8 +2302,7 @@ def test_make_ingress_for_service_reuse_existing_services_ignored(
or `KubeSpawner.enable_user_namespaces=True`
"""
common_labels = {
'app.kubernetes.io/name': 'jupyterhub',
'app.kubernetes.io/managed-by': 'kubespawner',
'common/label': 'value0',
'component': 'singleuser-server',
}
endpoint, service, ingress = api_client.sanitize_for_serialization(
Expand All @@ -2342,9 +2328,7 @@ def test_make_ingress_for_service_reuse_existing_services_ignored(
'hub.jupyter.org/proxy-target': target,
},
'labels': {
'app.kubernetes.io/name': 'jupyterhub',
'app.kubernetes.io/managed-by': 'kubespawner',
'component': 'singleuser-server',
'common/label': 'value0',
'hub.jupyter.org/proxy-route': 'true',
},
'name': 'jupyter-test',
Expand All @@ -2366,9 +2350,7 @@ def test_make_ingress_for_service_reuse_existing_services_ignored(
'hub.jupyter.org/proxy-target': target,
},
'labels': {
'app.kubernetes.io/name': 'jupyterhub',
'app.kubernetes.io/managed-by': 'kubespawner',
'component': 'singleuser-server',
'common/label': 'value0',
'hub.jupyter.org/proxy-route': 'true',
},
'name': 'jupyter-test',
Expand Down Expand Up @@ -2412,9 +2394,7 @@ def test_make_ingress_with_subdomain_host(target):
Test specification of the ingress objects
"""
common_labels = {
'app.kubernetes.io/name': 'jupyterhub',
'app.kubernetes.io/managed-by': 'kubespawner',
'component': 'singleuser-server',
'common/label': 'value0',
}
_endpoint, _service, ingress = api_client.sanitize_for_serialization(
make_ingress(
Expand All @@ -2436,9 +2416,7 @@ def test_make_ingress_with_subdomain_host(target):
'hub.jupyter.org/proxy-target': target,
},
'labels': {
'app.kubernetes.io/name': 'jupyterhub',
'app.kubernetes.io/managed-by': 'kubespawner',
'component': 'singleuser-server',
'common/label': 'value0',
'hub.jupyter.org/proxy-route': 'true',
},
'name': 'jupyter-test',
Expand Down Expand Up @@ -2483,9 +2461,7 @@ def test_make_ingress_with_specifications(target, ip):
Test specification of the ingress objects
"""
common_labels = {
'app.kubernetes.io/name': 'jupyterhub',
'app.kubernetes.io/managed-by': 'kubespawner',
'component': 'singleuser-server',
'common/label': 'value0',
}
ingress_specifications = [
{
Expand Down Expand Up @@ -2517,9 +2493,7 @@ def test_make_ingress_with_specifications(target, ip):
'hub.jupyter.org/proxy-target': target,
},
'labels': {
'app.kubernetes.io/name': 'jupyterhub',
'app.kubernetes.io/managed-by': 'kubespawner',
'component': 'singleuser-server',
'common/label': 'value0',
'hub.jupyter.org/proxy-route': 'true',
},
'name': 'jupyter-test',
Expand All @@ -2536,9 +2510,7 @@ def test_make_ingress_with_specifications(target, ip):
'hub.jupyter.org/proxy-target': target,
},
'labels': {
'app.kubernetes.io/name': 'jupyterhub',
'app.kubernetes.io/managed-by': 'kubespawner',
'component': 'singleuser-server',
'common/label': 'value0',
'hub.jupyter.org/proxy-route': 'true',
},
'name': 'jupyter-test',
Expand All @@ -2558,9 +2530,7 @@ def test_make_ingress_with_specifications(target, ip):
'hub.jupyter.org/proxy-target': target,
},
'labels': {
'app.kubernetes.io/name': 'jupyterhub',
'app.kubernetes.io/managed-by': 'kubespawner',
'component': 'singleuser-server',
'common/label': 'value0',
'hub.jupyter.org/proxy-route': 'true',
},
'name': 'jupyter-test',
Expand Down Expand Up @@ -2621,9 +2591,7 @@ def test_make_ingress_external_name_with_specifications():
Test specification of the ingress objects
"""
common_labels = {
'app.kubernetes.io/name': 'jupyterhub',
'app.kubernetes.io/managed-by': 'kubespawner',
'component': 'singleuser-server',
'common/label': 'value0',
}
ingress_specifications = [
{
Expand Down Expand Up @@ -2657,9 +2625,7 @@ def test_make_ingress_external_name_with_specifications():
'hub.jupyter.org/proxy-target': 'http://my-pod-name:9000',
},
'labels': {
'app.kubernetes.io/name': 'jupyterhub',
'app.kubernetes.io/managed-by': 'kubespawner',
'component': 'singleuser-server',
'common/label': 'value0',
'hub.jupyter.org/proxy-route': 'true',
},
'name': 'jupyter-test',
Expand All @@ -2680,9 +2646,7 @@ def test_make_ingress_external_name_with_specifications():
'hub.jupyter.org/proxy-target': 'http://my-pod-name:9000',
},
'labels': {
'app.kubernetes.io/name': 'jupyterhub',
'app.kubernetes.io/managed-by': 'kubespawner',
'component': 'singleuser-server',
'common/label': 'value0',
'hub.jupyter.org/proxy-route': 'true',
},
'name': 'jupyter-test',
Expand Down Expand Up @@ -2762,9 +2726,7 @@ def test_make_ingress_with_specifications_and_matching_subdomain_host(target, ho
Test specification of the ingress objects
"""
common_labels = {
'app.kubernetes.io/name': 'jupyterhub',
'app.kubernetes.io/managed-by': 'kubespawner',
'component': 'singleuser-server',
'common/label': 'value0',
}
ingress_specifications = [
{
Expand Down Expand Up @@ -2794,9 +2756,7 @@ def test_make_ingress_with_specifications_and_matching_subdomain_host(target, ho
'hub.jupyter.org/proxy-target': target,
},
'labels': {
'app.kubernetes.io/name': 'jupyterhub',
'app.kubernetes.io/managed-by': 'kubespawner',
'component': 'singleuser-server',
'common/label': 'value0',
'hub.jupyter.org/proxy-route': 'true',
},
'name': 'jupyter-test',
Expand Down Expand Up @@ -2861,9 +2821,7 @@ def test_make_ingress_with_specifications_and_not_matching_subdomain_host(target
Test specification of the ingress objects
"""
common_labels = {
'app.kubernetes.io/name': 'jupyterhub',
'app.kubernetes.io/managed-by': 'kubespawner',
'component': 'singleuser-server',
'common/label': 'value0',
}
ingress_specifications = [
{
Expand Down Expand Up @@ -2893,9 +2851,7 @@ def test_make_ingress_with_specifications_and_not_matching_subdomain_host(target
'hub.jupyter.org/proxy-target': target,
},
'labels': {
'app.kubernetes.io/name': 'jupyterhub',
'app.kubernetes.io/managed-by': 'kubespawner',
'component': 'singleuser-server',
'common/label': 'value0',
'hub.jupyter.org/proxy-route': 'true',
},
'name': 'jupyter-test',
Expand Down Expand Up @@ -2954,8 +2910,7 @@ def test_make_ingress_with_specifications_and_not_matching_subdomain_host(target

def test_make_namespace():
labels = {
'app.kubernetes.io/managed-by': 'kubespawner',
'component': 'singleuser-server',
'some/label': 'value0',
}
namespace = api_client.sanitize_for_serialization(
make_namespace(name='test-namespace', labels=labels)
Expand All @@ -2964,8 +2919,7 @@ def test_make_namespace():
'metadata': {
'annotations': {},
'labels': {
'component': 'singleuser-server',
'app.kubernetes.io/managed-by': 'kubespawner',
'some/label': 'value0',
},
'name': 'test-namespace',
},
Expand Down

0 comments on commit cc51183

Please sign in to comment.