[HWORKS-1421] Add option to specify kubernetes namespace at project creation (#336)

Author: o-alex

python/hopsworks_common/project.py

@@ -51,6 +51,7 @@ def __init__(
         services=None,
         datasets=None,
         creation_status=None,
+        project_namespace=None,
         **kwargs,
     ):
         self._id = project_id
@@ -67,6 +68,7 @@ def __init__(
         self._git_api = git_api.GitApi()
         self._dataset_api = dataset_api.DatasetApi()
         self._environment_api = environment_api.EnvironmentApi()
+        self._project_namespace = project_namespace
 
     @classmethod
     def from_response_json(cls, json_dict):
@@ -101,6 +103,11 @@ def created(self):
         """Timestamp when the project was created"""
         return self._created
 
+    @property
+    def project_namespace(self):
+        """Kubernetes namespace used by project"""
+        return self._project_namespace
+
     def get_feature_store(
         self, name: Optional[str] = None, engine: Optional[str] = None
     ):  # -> hsfs.feature_store.FeatureStore

python/hsml/core/serving_api.py

@@ -260,7 +260,7 @@ def _send_inference_request_via_rest_protocol(
                 path_params = self._get_istio_inference_path(deployment_instance)
                 # - add host header
                 headers["host"] = self._get_inference_request_host_header(
-                    _client._project_name,
+                    deployment_instance.project_namespace,
                     deployment_instance.name,
                     client.get_knative_domain(),
                 )
@@ -291,9 +291,7 @@ def _send_inference_request_via_grpc_protocol(
             # the channel, which will be reused in all following calls on the same deployment object.
             # The gRPC channel is freed when calling deployment.stop()
             print("Initializing gRPC channel...")
-            deployment_instance._grpc_channel = self._create_grpc_channel(
-                deployment_instance.name
-            )
+            deployment_instance._grpc_channel = self._create_grpc_channel(deployment_instance)
         # build an infer request
         request = InferRequest(
             infer_inputs=data,
@@ -308,11 +306,11 @@ def _send_inference_request_via_grpc_protocol(
         # extract infer outputs
         return infer_response.outputs
 
-    def _create_grpc_channel(self, deployment_name: str):
+    def _create_grpc_channel(self, deployment_instance):
         _client = client.istio.get_instance()
         service_hostname = self._get_inference_request_host_header(
-            _client._project_name,
-            deployment_name,
+            deployment_instance.project_namespace,
+            deployment_instance.name,
             client.get_knative_domain(),
         )
         return _client._create_grpc_channel(service_hostname)
@@ -405,11 +403,9 @@ def get_logs(self, deployment_instance, component, tail):
         )
 
     def _get_inference_request_host_header(
-        self, project_name: str, deployment_name: str, domain: str
+        self, project_namespace: str, deployment_name: str, domain: str
     ):
-        return "{}.{}.{}".format(
-            deployment_name, project_name.replace("_", "-"), domain
-        ).lower()
+        return "{}.{}.{}".format(deployment_name, project_namespace, domain).lower()
 
     def _get_hopsworks_inference_path(self, project_id: int, deployment_instance):
         return [

python/hsml/deployment.py

@@ -38,10 +38,12 @@ def __init__(
         predictor,
         name: Optional[str] = None,
         description: Optional[str] = None,
+        project_namespace: str = None,
         **kwargs,
     ):
         self._predictor = predictor
         self._description = description
+        self._project_namespace = project_namespace
 
         if self._predictor is None:
             raise ModelServingException("A predictor is required")
@@ -476,6 +478,15 @@ def environment(self):
     def environment(self, environment: str):
         self._predictor.environment = environment
 
+    @property
+    def project_namespace(self):
+        """Name of inference environment"""
+        return self._predictor.project_namespace
+
+    @project_namespace.setter
+    def project_namespace(self, project_namespace: str):
+        self._predictor.project_namespace = project_namespace
+
     def __repr__(self):
         desc = (
             f", description: {self._description!r}"

python/hsml/predictor.py

@@ -62,6 +62,7 @@ def __init__(
         creator: Optional[str] = None,
         api_protocol: Optional[str] = INFERENCE_ENDPOINTS.API_PROTOCOL_REST,
         environment: Optional[str] = None,
+        project_namespace: str = None,
         **kwargs,
     ):
         serving_tool = (
@@ -98,6 +99,7 @@ def __init__(
         self._validate_script_file(self._model_framework, self._script_file)
         self._api_protocol = api_protocol
         self._environment = environment
+        self._project_namespace = project_namespace
 
     def deploy(self):
         """Create a deployment for this predictor and persists it in the Model Serving.
@@ -278,6 +280,7 @@ def extract_fields_from_json(cls, json_decamelized):
         if "environment_dto" in json_decamelized:
             environment = json_decamelized.pop("environment_dto")
             kwargs["environment"] = environment["name"]
+        kwargs["project_namespace"] = json_decamelized.pop("project_namespace")
         return kwargs
 
     def update_from_response_json(self, json_dict):
@@ -305,6 +308,7 @@ def to_dict(self):
             "servingTool": self._serving_tool,
             "predictor": self._script_file,
             "apiProtocol": self._api_protocol,
+            "project_namespace": self._project_namespace,
         }
         if self.environment is not None:
             json = {**json, **{"environmentDTO": {"name": self._environment}}}
@@ -478,6 +482,15 @@ def environment(self):
     def environment(self, environment):
         self._environment = environment
 
+    @property
+    def project_namespace(self):
+        """Kubernetes project namespace"""
+        return self._project_namespace
+
+    @project_namespace.setter
+    def project_namespace(self, project_namespace):
+        self._project_namespace = project_namespace
+
     def __repr__(self):
         desc = (
             f", description: {self._description!r}"

python/tests/fixtures/predictor_fixtures.json

@@ -43,7 +43,8 @@
           },
           "environment_dto": {
             "name": "misc-inference-pipeline"
-          }
+          },
+          "project_namespace": "test"
         }
       ]
     }
@@ -98,7 +99,8 @@
           },
           "environment_dto": {
             "name": "misc-inference-pipeline"
-          }
+          },
+          "project_namespace": "test"
         },
         {
           "id": 2,
@@ -140,7 +142,8 @@
           },
           "environment_dto": {
             "name": "misc-inference-pipeline"
-          }
+          },
+          "project_namespace": "test"
         }
       ]
     }