Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move imagepullsecrets sample to samples/core #1767

Merged
merged 15 commits into from
Aug 9, 2019
Merged

Move imagepullsecrets sample to samples/core #1767

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e0c7132
Remove redundant import.
numerology Jul 23, 2019
70972db
Simplify sample_test.yaml by using withItem syntax.
Jul 31, 2019
deb6cc0
Merge branch 'master' of https://github.com/kubeflow/pipelines
Jul 31, 2019
da9a42a
Simplify sample_test.yaml by using withItem syntax.
Jul 31, 2019
a203039
Merge branch 'master' of https://github.com/numerology/pipelines
Jul 31, 2019
81ccbf4
Change dict to str in withItems.
Jul 31, 2019
d94a945
Merge branch 'master' of https://github.com/kubeflow/pipelines
Jul 31, 2019
bc8a06f
Merge branch 'master' of https://github.com/kubeflow/pipelines
Jul 31, 2019
a71515c
Merge branch 'master' of https://github.com/kubeflow/pipelines
Aug 1, 2019
aa0c3b6
Add image pull secret sample.
Aug 2, 2019
ff32a2b
Merge branch 'master' of https://github.com/kubeflow/pipelines into a…
Aug 5, 2019
2a82e02
Move imagepullsecret sample from test dir to sample dir. Waiting on c…
Aug 7, 2019
ad7a965
Update the location of imagepullsecrets so that it can serve as an ex…
Aug 8, 2019
94fe63e
Add minimal comments documenting usage.
Aug 8, 2019
6b7b335
Move .yaml to testdata/
Aug 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Move .yaml to testdata/ 
and

Merge branch 'master' of https://github.com/kubeflow/pipelines into add_imagepullsecret

# Conflicts:
#	sdk/python/tests/compiler/compiler_tests.py
  • Loading branch information
numerology committed Aug 8, 2019
commit 6b7b335103f25858ac3af113ccb8fcf7d1e783ca
234 changes: 118 additions & 116 deletions sdk/python/tests/compiler/compiler_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,94 +56,94 @@ def test_operator_to_template(self):
name='GOOGLE_APPLICATION_CREDENTIALS',
value='/secret/gcp-credentials/user-gcp-sa.json'))
res = dsl.ResourceOp(
name="test-resource",
k8s_resource=k8s_client.V1PersistentVolumeClaim(
api_version="v1",
kind=kind,
metadata=k8s_client.V1ObjectMeta(
name="resource"
)
),
attribute_outputs={"out": json}
name="test-resource",
k8s_resource=k8s_client.V1PersistentVolumeClaim(
api_version="v1",
kind=kind,
metadata=k8s_client.V1ObjectMeta(
name="resource"
)
),
attribute_outputs={"out": json}
)
golden_output = {
'container': {
'image': 'image',
'args': [
'echo {{inputs.parameters.msg1}} {{inputs.parameters.msg2}} | tee /tmp/message.txt'
],
'command': ['sh', '-c'],
'env': [
{
'name': 'GOOGLE_APPLICATION_CREDENTIALS',
'value': '/secret/gcp-credentials/user-gcp-sa.json'
}
],
'volumeMounts':[
{
'mountPath': '/secret/gcp-credentials',
'name': 'gcp-credentials',
}
]
},
'inputs': {'parameters':
[
{'name': 'msg1'},
{'name': 'msg2', 'value': 'value2'},
]},
'name': 'echo',
'outputs': {
'parameters': [
{'name': 'echo-merged',
'valueFrom': {'path': '/tmp/message.txt'}
}],
'artifacts': [{
'name': 'mlpipeline-ui-metadata',
'path': '/mlpipeline-ui-metadata.json',
'optional': True,
},{
'name': 'mlpipeline-metrics',
'path': '/mlpipeline-metrics.json',
'optional': True,
}]
}
'container': {
'image': 'image',
'args': [
'echo {{inputs.parameters.msg1}} {{inputs.parameters.msg2}} | tee /tmp/message.txt'
],
'command': ['sh', '-c'],
'env': [
{
'name': 'GOOGLE_APPLICATION_CREDENTIALS',
'value': '/secret/gcp-credentials/user-gcp-sa.json'
}
],
'volumeMounts':[
{
'mountPath': '/secret/gcp-credentials',
'name': 'gcp-credentials',
}
]
},
'inputs': {'parameters':
[
{'name': 'msg1'},
{'name': 'msg2', 'value': 'value2'},
]},
'name': 'echo',
'outputs': {
'parameters': [
{'name': 'echo-merged',
'valueFrom': {'path': '/tmp/message.txt'}
}],
'artifacts': [{
'name': 'mlpipeline-ui-metadata',
'path': '/mlpipeline-ui-metadata.json',
'optional': True,
},{
'name': 'mlpipeline-metrics',
'path': '/mlpipeline-metrics.json',
'optional': True,
}]
}
}
res_output = {
'inputs': {
'parameters': [{
'name': 'json'
}, {
'name': 'kind'
}]
},
'name': 'test-resource',
'outputs': {
'parameters': [{
'name': 'test-resource-manifest',
'valueFrom': {
'jsonPath': '{}'
}
}, {
'name': 'test-resource-name',
'valueFrom': {
'jsonPath': '{.metadata.name}'
}
}, {
'name': 'test-resource-out',
'valueFrom': {
'jsonPath': '{{inputs.parameters.json}}'
}
}]
},
'resource': {
'action': 'create',
'manifest': (
"apiVersion: v1\n"
"kind: '{{inputs.parameters.kind}}'\n"
"metadata:\n"
" name: resource\n"
)
}
'inputs': {
'parameters': [{
'name': 'json'
}, {
'name': 'kind'
}]
},
'name': 'test-resource',
'outputs': {
'parameters': [{
'name': 'test-resource-manifest',
'valueFrom': {
'jsonPath': '{}'
}
}, {
'name': 'test-resource-name',
'valueFrom': {
'jsonPath': '{.metadata.name}'
}
}, {
'name': 'test-resource-out',
'valueFrom': {
'jsonPath': '{{inputs.parameters.json}}'
}
}]
},
'resource': {
'action': 'create',
'manifest': (
"apiVersion: v1\n"
"kind: '{{inputs.parameters.kind}}'\n"
"metadata:\n"
" name: resource\n"
)
}
}

self.maxDiff = None
Expand Down Expand Up @@ -286,9 +286,10 @@ def _test_py_compile_yaml(self, file_base_name):
shutil.rmtree(tmpdir)

def _test_sample_py_compile_yaml(self, file_base_name):
# Jump back to sample dir.
test_data_dir = os.path.join(self.core_sample_path, file_base_name)
py_file = os.path.join(test_data_dir, file_base_name + '.py')
# Jump back to sample dir for sample python file.
sample_data_dir = os.path.join(self.core_sample_path, file_base_name)
test_data_dir = os.path.join(os.path.dirname(__file__), 'testdata')
py_file = os.path.join(sample_data_dir, file_base_name + '.py')
tmpdir = tempfile.mkdtemp()
try:
target_yaml = os.path.join(tmpdir, file_base_name + '-pipeline.yaml')
Expand Down Expand Up @@ -491,8 +492,8 @@ def my_pipeline(a: {'GCRPath': {'openapi_schema_validator': {"type": "string", "
def test_compile_pipeline_with_after(self):
def op():
return dsl.ContainerOp(
name='Some component name',
image='image'
name='Some component name',
image='image'
)

@dsl.pipeline(name='Pipeline', description='')
Expand All @@ -517,16 +518,16 @@ def _test_op_to_template_yaml(self, ops, file_base_name):
def test_tolerations(self):
"""Test a pipeline with a tolerations."""
op1 = dsl.ContainerOp(
name='download',
image='busybox',
command=['sh', '-c'],
arguments=['sleep 10; wget localhost:5678 -O /tmp/results.txt'],
file_outputs={'downloaded': '/tmp/results.txt'}) \
name='download',
image='busybox',
command=['sh', '-c'],
arguments=['sleep 10; wget localhost:5678 -O /tmp/results.txt'],
file_outputs={'downloaded': '/tmp/results.txt'}) \
.add_toleration(V1Toleration(
effect='NoSchedule',
key='gpu',
operator='Equal',
value='run'))
effect='NoSchedule',
key='gpu',
operator='Equal',
value='run'))

self._test_op_to_template_yaml(op1, file_base_name='tolerations')

Expand All @@ -535,12 +536,12 @@ def test_set_display_name(self):

import kfp
op1 = kfp.components.load_component_from_text(
'''
name: Component name
implementation:
container:
image: busybox
'''
'''
name: Component name
implementation:
container:
image: busybox
'''
)

@dsl.pipeline()
Expand All @@ -554,11 +555,11 @@ def some_pipeline():
def test_set_ttl_seconds_after_finished(self):
"""Test a pipeline with ttl after finished."""
def some_op():
return dsl.ContainerOp(
name='sleep',
image='busybox',
command=['sleep 1'],
)
return dsl.ContainerOp(
name='sleep',
image='busybox',
command=['sleep 1'],
)

@dsl.pipeline()
def some_pipeline():
Expand Down Expand Up @@ -595,17 +596,17 @@ def test_add_pod_env(self):

def test_init_container(self):
echo = dsl.UserContainer(
name='echo',
image='alpine:latest',
command=['echo', 'bye'])
name='echo',
image='alpine:latest',
command=['echo', 'bye'])

@dsl.pipeline(name='InitContainer', description='A pipeline with init container.')
def init_container_pipeline():
dsl.ContainerOp(
name='hello',
image='alpine:latest',
command=['echo', 'hello'],
init_containers=[echo])
name='hello',
image='alpine:latest',
command=['echo', 'hello'],
init_containers=[echo])

workflow_dict = compiler.Compiler()._compile(init_container_pipeline)
for template in workflow_dict['spec']['templates']:
Expand All @@ -614,3 +615,4 @@ def init_container_pipeline():
self.assertEqual(len(init_containers),1)
init_container = init_containers[0]
self.assertEqual(init_container, {'image':'alpine:latest', 'command': ['echo', 'bye'], 'name': 'echo'})

0 ...re/imagepullsecrets/imagepullsecrets.yaml → ...s/compiler/testdata/imagepullsecrets.yaml
View file
Open in desktop
File renamed without changes.
You are viewing a condensed version of this merge commit. You can view the full changes here.