[Runtimes] Fix function config compilation to not ignore .spec.build.base_image for Nuclio runtimes

mlrun/runtimes/function.py

@@ -1131,7 +1131,11 @@ def compile_function_config(function: RemoteRuntime):
         )
         update_in(config, "metadata.name", function.metadata.name)
         update_in(config, "spec.volumes", function.spec.generate_nuclio_volumes())
-        base_image = get_in(config, "spec.build.baseImage") or function.spec.image
+        base_image = (
+            get_in(config, "spec.build.baseImage")
+            or function.spec.image
+            or function.spec.build.base_image
+        )
         if base_image:
             update_in(config, "spec.build.baseImage", enrich_image_url(base_image))
 
@@ -1153,10 +1157,12 @@ def compile_function_config(function: RemoteRuntime):
         )
 
         update_in(config, "spec.volumes", function.spec.generate_nuclio_volumes())
-        if function.spec.image:
+        base_image = function.spec.image or function.spec.build.base_image
+        if base_image:
             update_in(
-                config, "spec.build.baseImage", enrich_image_url(function.spec.image)
+                config, "spec.build.baseImage", enrich_image_url(base_image),
             )
+
         name = get_fullname(name, project, tag)
         function.status.nuclio_name = name
 
@@ -1166,7 +1172,6 @@ def compile_function_config(function: RemoteRuntime):
 
 
 def enrich_function_with_ingress(config, mode, service_type):
-
     # do not enrich with an ingress
     if mode == NuclioIngressAddTemplatedIngressModes.never:
         return
@@ -1181,7 +1186,6 @@ def enrich_function_with_ingress(config, mode, service_type):
     # we would enrich it with an ingress
     http_trigger = resolve_function_http_trigger(config["spec"])
     if not http_trigger:
-
         # function has an HTTP trigger without an ingress
         # TODO: read from nuclio-api frontend-spec
         http_trigger = {

tests/api/runtimes/test_nuclio.py

@@ -123,6 +123,7 @@ def _assert_deploy_called_basic_config(
         expected_labels=None,
         expected_env_from_secrets=None,
         expected_service_account=None,
+        expected_build_base_image=None,
     ):
         if expected_labels is None:
             expected_labels = {}
@@ -164,7 +165,11 @@ def _assert_deploy_called_basic_config(
             ).decode("utf-8")
             assert spec_source_code.startswith(original_source_code)
 
-            assert build_info["baseImage"] == self.image_name
+            if self.image_name or expected_build_base_image:
+                assert (
+                    build_info["baseImage"] == self.image_name
+                    or expected_build_base_image
+                )
 
             if expected_env_from_secrets:
                 env_vars = deploy_config["spec"]["env"]
@@ -270,7 +275,6 @@ def _assert_node_selections(
                 == {}
             )
         if expected_affinity:
-
             # deploy_spec returns affinity in CamelCase, V1Affinity is in snake_case
             assert (
                 deepdiff.DeepDiff(
@@ -425,6 +429,43 @@ def test_deploy_basic_function(self, db: Session, client: TestClient):
         self._serialize_and_deploy_nuclio_function(function)
         self._assert_deploy_called_basic_config(expected_class=self.class_name)
 
+    def test_deploy_build_base_image(
+        self, db: Session, k8s_secrets_mock: K8sSecretsMock
+    ):
+        expected_build_base_image = "mlrun/base_mlrun:latest"
+        self.image_name = None
+
+        function = self._generate_runtime(self.runtime_kind)
+        function.spec.build.base_image = expected_build_base_image
+
+        self._serialize_and_deploy_nuclio_function(function)
+        self._assert_deploy_called_basic_config(
+            expected_class=self.class_name,
+            expected_build_base_image=expected_build_base_image,
+        )
+
+    def test_deploy_image_name_and_build_base_image(
+        self, db: Session, k8s_secrets_mock: K8sSecretsMock
+    ):
+        """When spec.image and also spec.build.base_image are both defined the spec.image should be applied
+         to spec.baseImage in nuclio."""
+
+        function = self._generate_runtime(self.runtime_kind)
+        function.spec.build.base_image = "mlrun/base_mlrun:latest"
+
+        self._serialize_and_deploy_nuclio_function(function)
+        self._assert_deploy_called_basic_config(expected_class=self.class_name)
+
+    def test_deploy_without_image_and_build_base_image(
+        self, db: Session, k8s_secrets_mock: K8sSecretsMock
+    ):
+        self.image_name = None
+
+        function = self._generate_runtime(self.runtime_kind)
+        self._serialize_and_deploy_nuclio_function(function)
+
+        self._assert_deploy_called_basic_config(expected_class=self.class_name)
+
     def test_deploy_function_with_labels(self, db: Session, client: TestClient):
         labels = {
             "key": "value",