Merge branch 'feature/CH-110' of github.com:MetaCell/cloud-harness into develop

Author: filippomc

applications/jupyterhub/deploy/resources/hub/jupyterhub_config.py

@@ -1,5 +1,4 @@
 # load the config object (satisfies linters)
-
 c = get_config()  # noqa
 
 import glob
@@ -25,7 +24,7 @@
 configuration_directory = os.path.dirname(os.path.realpath(__file__))
 sys.path.insert(0, configuration_directory)
 
-from z2jh import (  # noqa
+from z2jh import ( # noqa
     get_config,
     get_name,
     get_name_env,
@@ -118,28 +117,35 @@ def camelCaseify(s):
 )
 
 # implement common labels
-# this duplicates the jupyterhub.commonLabels helper
+# This mimics the jupyterhub.commonLabels helper, but declares managed-by to
+# kubespawner instead of helm.
+#
+# The labels app and release are old labels enabled to be deleted in z2jh 5, but
+# for now retained to avoid a breaking change in z2jh 4 that would force user
+# server restarts. Restarts would be required because NetworkPolicy resources
+# must select old/new pods with labels that then needs to be seen on both
+# old/new pods, and we want these resources to keep functioning for old/new user
+# server pods during an upgrade.
+#
 common_labels = c.KubeSpawner.common_labels = {}
-common_labels["app"] = get_config(
+common_labels["app.kubernetes.io/name"] = common_labels["app"] = get_config(
     "nameOverride",
     default=get_config("Chart.Name", "jupyterhub"),
 )
-common_labels["heritage"] = "jupyterhub"
+release = get_config("Release.Name")
+if release:
+    common_labels["app.kubernetes.io/instance"] = common_labels["release"] = release
 chart_name = get_config("Chart.Name")
 chart_version = get_config("Chart.Version")
 if chart_name and chart_version:
-    common_labels["chart"] = "{}-{}".format(
-        chart_name,
-        chart_version.replace("+", "_"),
+    common_labels["helm.sh/chart"] = common_labels["chart"] = (
+        f"{chart_name}-{chart_version.replace('+', '_')}"
     )
-release = get_config("Release.Name")
-if release:
-    common_labels["release"] = release
+common_labels["app.kubernetes.io/managed-by"] = "kubespawner"
 
 c.KubeSpawner.namespace = os.environ.get("POD_NAMESPACE", "default")
 
 # Max number of consecutive failures before the Hub restarts itself
-# requires jupyterhub 0.9.2
 set_config_if_not_none(
     c.Spawner,
     "consecutive_failure_limit",
@@ -260,7 +266,8 @@ def camelCaseify(s):
 storage_type = get_config("singleuser.storage.type")
 if storage_type == "dynamic":
     pvc_name_template = get_config("singleuser.storage.dynamic.pvcNameTemplate")
-    c.KubeSpawner.pvc_name_template = pvc_name_template
+    if pvc_name_template:
+        c.KubeSpawner.pvc_name_template = pvc_name_template
     volume_name_template = get_config("singleuser.storage.dynamic.volumeNameTemplate")
     c.KubeSpawner.storage_pvc_ensure = True
     set_config_if_not_none(
@@ -279,13 +286,14 @@ def camelCaseify(s):
     c.KubeSpawner.volumes = [
         {
             "name": volume_name_template,
-            "persistentVolumeClaim": {"claimName": pvc_name_template},
+            "persistentVolumeClaim": {"claimName": "{pvc_name_template}"},
         }
     ]
     c.KubeSpawner.volume_mounts = [
         {
             "mountPath": get_config("singleuser.storage.homeMountPath"),
             "name": volume_name_template,
+            "subPath": get_config("singleuser.storage.dynamic.subPath"),
         }
     ]
 elif storage_type == "static":
@@ -491,7 +499,6 @@ def camelCaseify(s):
         cfg.pop("keys", None)
     c[app].update(cfg)
 
-
 # load /usr/local/etc/jupyterhub/jupyterhub_config.d config files
 config_dir = "/usr/local/etc/jupyterhub/jupyterhub_config.d"
 if os.path.isdir(config_dir):

applications/jupyterhub/deploy/resources/hub/z2jh.py

@@ -3,6 +3,7 @@
 
 Methods here can be imported by extraConfig in values.yaml
 """
+
 import os
 from collections.abc import Mapping
 from functools import lru_cache
@@ -141,4 +142,4 @@ def set_config_if_not_none(cparent, name, key):
     """
     data = get_config(key)
     if data is not None:
-        setattr(cparent, name, data)
+        setattr(cparent, name, data)

applications/jupyterhub/src/harness_jupyter/harness_jupyter/jupyterhub.py

@@ -225,10 +225,10 @@ def change_pod_manifest(self: KubeSpawner):
 
                         # set user quota cpu/mem usage if value has a "value" else don't change the value
                         logging.info("Setting user quota cpu/mem usage")
-                        set_key_value(self, key="cpu_guarantee", value=user_quotas.get(
-                            "quota-ws-guaranteecpu"))
+                        set_key_value(self, key="cpu_guarantee", value=float(user_quotas.get(
+                            "quota-ws-guaranteecpu")))
                         set_key_value(self, key="cpu_limit",
-                                      value=user_quotas.get("quota-ws-maxcpu"))
+                                      value=float(user_quotas.get("quota-ws-maxcpu")))
                         set_key_value(self, key="mem_guarantee", value=user_quotas.get(
                             "quota-ws-guaranteemem"), unit="G")
                         set_key_value(self, key="mem_limit", value=user_quotas.get(

libraries/cloudharness-common/cloudharness/auth/quota.py

@@ -39,7 +39,7 @@ def get_user_quotas(application_config: ApplicationConfig = None, user_id: str =
     valid_keys_map = {key for key in base_quotas}
 
     try:
-        return get_user_attributes(user_id, valid_keys=valid_keys_map, default_attributes=base_quotas)
+        return get_user_attributes(user_id, valid_keys=valid_keys_map, default_attributes=base_quotas, transform_value_fn=attribute_to_quota)
 
     except UserNotFound as e:
         log.warning("Quotas not available: error retrieving user: %s", user_id)