Skip to content

Commit

Permalink
SDK - Annotate pods with component_ref (#3727)
Browse files Browse the repository at this point in the history
* SDK - Annotate pods with component_ref

This preserves the information about the digest of the component and the location from which the component was loaded.

* Fixed compiler tests
  • Loading branch information
Ark-kun committed May 12, 2020
1 parent 21e8ef1 commit 2279bde
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 0 deletions.
3 changes: 3 additions & 0 deletions sdk/python/kfp/compiler/_op_to_template.py
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,9 @@ def _op_to_template(op: BaseOp):
if isinstance(op, dsl.ContainerOp) and op._metadata:
template.setdefault('metadata', {}).setdefault('annotations', {})['pipelines.kubeflow.org/component_spec'] = json.dumps(op._metadata.to_dict(), sort_keys=True)

if hasattr(op, '_component_ref'):
template.setdefault('metadata', {}).setdefault('annotations', {})['pipelines.kubeflow.org/component_ref'] = json.dumps(op._component_ref.to_dict(), sort_keys=True)

if isinstance(op, dsl.ContainerOp) and op.execution_options:
if op.execution_options.caching_strategy.max_cache_staleness:
template.setdefault('metadata', {}).setdefault('annotations', {})['pipelines.kubeflow.org/max_cache_staleness'] = str(op.execution_options.caching_strategy.max_cache_staleness)
Expand Down
1 change: 1 addition & 0 deletions sdk/python/kfp/dsl/_component_bridge.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ def _create_container_op_from_component_and_arguments(
component_meta = copy.copy(component_spec)
component_meta.implementation = None
task._set_metadata(component_meta)
task._component_ref = component_ref

if container_spec.env:
from kubernetes import client as k8s_client
Expand Down
14 changes: 14 additions & 0 deletions sdk/python/tests/compiler/compiler_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,8 @@ def test_basic_workflow(self):

for workflow in golden, compiled:
del workflow['metadata']
for template in workflow['spec']['templates']:
template.pop('metadata', None)

self.maxDiff = None
# Comment next line for generating golden yaml.
Expand Down Expand Up @@ -235,6 +237,8 @@ def test_composing_workflow(self):

for workflow in golden, compiled:
del workflow['metadata']
for template in workflow['spec']['templates']:
template.pop('metadata', None)

self.maxDiff = None
# Comment next line for generating golden yaml.
Expand Down Expand Up @@ -265,6 +269,8 @@ def test_package_compile(self):

for workflow in golden, compiled:
del workflow['metadata']
for template in workflow['spec']['templates']:
template.pop('metadata', None)

self.maxDiff = None
self.assertEqual(golden, compiled)
Expand All @@ -286,6 +292,8 @@ def _test_py_compile_zip(self, file_base_name):

for workflow in golden, compiled:
del workflow['metadata']
for template in workflow['spec']['templates']:
template.pop('metadata', None)

self.maxDiff = None
self.assertEqual(golden, compiled)
Expand All @@ -306,6 +314,8 @@ def _test_py_compile_targz(self, file_base_name):

for workflow in golden, compiled:
del workflow['metadata']
for template in workflow['spec']['templates']:
template.pop('metadata', None)

self.maxDiff = None
self.assertEqual(golden, compiled)
Expand All @@ -328,6 +338,8 @@ def _test_py_compile_yaml(self, file_base_name):

for workflow in golden, compiled:
del workflow['metadata']
for template in workflow['spec']['templates']:
template.pop('metadata', None)

self.maxDiff = None
self.assertEqual(golden, compiled)
Expand All @@ -353,6 +365,8 @@ def _test_sample_py_compile_yaml(self, file_base_name):

for workflow in golden, compiled:
del workflow['metadata']
for template in workflow['spec']['templates']:
template.pop('metadata', None)

self.maxDiff = None
self.assertEqual(golden, compiled)
Expand Down

0 comments on commit 2279bde

Please sign in to comment.