Exclude the builder from image tag calculation (#3188)

* Exclude the builder from image tag calculation

Signed-off-by: Kevin Su <pingsutw@apache.org>

* hash

Signed-off-by: Kevin Su <pingsutw@apache.org>

---------

Signed-off-by: Kevin Su <pingsutw@apache.org>

Author: pingsutw

flytekit/image_spec/image_spec.py

@@ -160,7 +160,7 @@ def id(self) -> str:
 
         :return: a unique identifier of the ImageSpec
         """
-        parameters_to_exclude = ["pip_secret_mounts"]
+        parameters_to_exclude = ["pip_secret_mounts", "builder"]
         # Only get the non-None values in the ImageSpec to ensure the hash is consistent across different Flytekit versions.
         image_spec_dict = asdict(
             self, dict_factory=lambda x: {k: v for (k, v) in x if v is not None and k not in parameters_to_exclude}

tests/flytekit/unit/core/image_spec/test_image_spec.py

@@ -63,7 +63,7 @@ def test_image_spec(mock_image_spec_builder, monkeypatch):
     assert image_spec.entrypoint == ["/bin/bash"]
     assert image_spec.copy == ["/src/file1.txt", "/src", "/src/file2.txt"]
 
-    assert image_spec.image_name() == f"localhost:30001/flytekit:AjLtng9gJfYzLnjbNy70gA"
+    assert image_spec.image_name() == f"localhost:30001/flytekit:{image_spec.tag}"
     ctx = context_manager.FlyteContext.current_context()
     with context_manager.FlyteContextManager.with_context(
         ctx.with_execution_state(ctx.execution_state.with_params(mode=ExecutionState.Mode.TASK_EXECUTION))
@@ -294,3 +294,10 @@ def test_image_spec_same_id_and_tag_with_pip_secret_mounts():
     image_spec_with_pip_secret_mounts = ImageSpec(name="my_image", pip_secret_mounts=[("src", "dst")])
     assert image_spec.id == image_spec_with_pip_secret_mounts.id
     assert image_spec.tag == image_spec_with_pip_secret_mounts.tag
+
+
+def test_image_spec_same_id_and_tag_with_builder():
+    image_spec = ImageSpec(name="my_image")
+    image_spec_with_builder = ImageSpec(name="my_image", builder="envd")
+    assert image_spec.id == image_spec_with_builder.id
+    assert image_spec.tag == image_spec_with_builder.tag