Skip to content

Commit ff2f038

Browse files
authored
Merge pull request opendatahub-io#12 from kubeflow/master
[pull] master from kubeflow:master
2 parents fd33856 + 9df5873 commit ff2f038

File tree

315 files changed

+13163
-106687
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

315 files changed

+13163
-106687
lines changed

.cloudbuild.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ steps:
6060
-f /workspace/frontend/Dockerfile \
6161
/workspace
6262
id: 'buildFrontend'
63-
waitFor: ['-']
63+
waitFor: ['copyPythonSDK']
6464
- name: 'gcr.io/cloud-builders/docker'
6565
entrypoint: /bin/bash
6666
args:
@@ -71,7 +71,7 @@ steps:
7171
--build-arg TAG_NAME="$(cat /workspace/VERSION)" \
7272
-f /workspace/backend/Dockerfile /workspace
7373
id: 'buildApiServer'
74-
waitFor: ['copyPythonSDK']
74+
waitFor: ['-']
7575

7676
- name: 'gcr.io/cloud-builders/docker'
7777
args: ['build', '-t', 'gcr.io/$PROJECT_ID/scheduledworkflow:$COMMIT_SHA', '-f',
@@ -134,7 +134,7 @@ steps:
134134
- name: 'gcr.io/cloud-builders/docker'
135135
entrypoint: '/bin/bash'
136136
args: ['-c', 'cd /workspace/components/kubeflow/launcher && ./build_image.sh -p $PROJECT_ID -t $COMMIT_SHA']
137-
id: 'buildLauncher'
137+
id: 'buildTFJobLauncher'
138138
waitFor: ["-"]
139139
- id: 'buildCpuTrainer'
140140
name: 'gcr.io/cloud-builders/docker'
@@ -186,16 +186,16 @@ steps:
186186
args: ['pull', 'gcr.io/ml-pipeline/minio:RELEASE.2019-08-14T20-37-41Z-license-compliance']
187187
id: 'pullMinio'
188188
- name: 'gcr.io/cloud-builders/docker'
189-
args: ['pull', 'gcr.io/ml-pipeline/mysql:5.7']
189+
args: ['pull', 'gcr.io/ml-pipeline/mysql:5.7-debian']
190190
id: 'pullMysql'
191191
- name: 'gcr.io/cloud-builders/docker'
192192
args: ['pull', 'gcr.io/cloudsql-docker/gce-proxy:1.25.0']
193193
id: 'pullCloudsqlProxy'
194194
- name: 'gcr.io/cloud-builders/docker'
195-
args: ['pull', 'gcr.io/ml-pipeline/argoexec:v3.2.3-license-compliance']
195+
args: ['pull', 'gcr.io/ml-pipeline/argoexec:v3.3.8-license-compliance']
196196
id: 'pullArgoExecutor'
197197
- name: 'gcr.io/cloud-builders/docker'
198-
args: ['pull', 'gcr.io/ml-pipeline/workflow-controller:v3.2.3-license-compliance']
198+
args: ['pull', 'gcr.io/ml-pipeline/workflow-controller:v3.3.8-license-compliance']
199199
id: 'pullArgoWorkflowController'
200200

201201
# Tag for Hosted - SemVersion to Major.Minor parsing

.release.cloudbuild.yaml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -432,14 +432,14 @@ steps:
432432
docker push gcr.io/ml-pipeline/google/pipelines-test/minio:$(cat /workspace/mm.ver)
433433
434434
- name: 'gcr.io/cloud-builders/docker'
435-
args: ['pull', 'gcr.io/ml-pipeline/mysql:5.7']
435+
args: ['pull', 'gcr.io/ml-pipeline/mysql:5.7-debian']
436436
id: 'pullMysql'
437437
- name: 'gcr.io/cloud-builders/docker'
438-
args: ['tag', 'gcr.io/ml-pipeline/mysql:5.7', 'gcr.io/ml-pipeline/google/pipelines/mysql:$TAG_NAME']
438+
args: ['tag', 'gcr.io/ml-pipeline/mysql:5.7-debian', 'gcr.io/ml-pipeline/google/pipelines/mysql:$TAG_NAME']
439439
id: 'tagMySqlForMarketplace'
440440
waitFor: ['pullMysql']
441441
- name: 'gcr.io/cloud-builders/docker'
442-
args: ['tag', 'gcr.io/ml-pipeline/mysql:5.7', 'gcr.io/ml-pipeline/google/pipelines-test/mysql:$TAG_NAME']
442+
args: ['tag', 'gcr.io/ml-pipeline/mysql:5.7-debian', 'gcr.io/ml-pipeline/google/pipelines-test/mysql:$TAG_NAME']
443443
id: 'tagMySqlForMarketplaceTest'
444444
waitFor: ['pullMysql']
445445
- id: 'tagMySqlForMarketplaceMajorMinor'
@@ -449,8 +449,8 @@ steps:
449449
args:
450450
- -ceux
451451
- |
452-
docker tag gcr.io/ml-pipeline/mysql:5.7 gcr.io/ml-pipeline/google/pipelines/mysql:$(cat /workspace/mm.ver)
453-
docker tag gcr.io/ml-pipeline/mysql:5.7 gcr.io/ml-pipeline/google/pipelines-test/mysql:$(cat /workspace/mm.ver)
452+
docker tag gcr.io/ml-pipeline/mysql:5.7-debian gcr.io/ml-pipeline/google/pipelines/mysql:$(cat /workspace/mm.ver)
453+
docker tag gcr.io/ml-pipeline/mysql:5.7-debian gcr.io/ml-pipeline/google/pipelines-test/mysql:$(cat /workspace/mm.ver)
454454
docker push gcr.io/ml-pipeline/google/pipelines/mysql:$(cat /workspace/mm.ver)
455455
docker push gcr.io/ml-pipeline/google/pipelines-test/mysql:$(cat /workspace/mm.ver)
456456
@@ -478,14 +478,14 @@ steps:
478478
docker push gcr.io/ml-pipeline/google/pipelines-test/cloudsqlproxy:$(cat /workspace/mm.ver)
479479
480480
- name: 'gcr.io/cloud-builders/docker'
481-
args: ['pull', 'gcr.io/ml-pipeline/argoexec:v3.2.3-license-compliance']
481+
args: ['pull', 'gcr.io/ml-pipeline/argoexec:v3.3.8-license-compliance']
482482
id: 'pullArgoExecutor'
483483
- name: 'gcr.io/cloud-builders/docker'
484-
args: ['tag', 'gcr.io/ml-pipeline/argoexec:v3.2.3-license-compliance', 'gcr.io/ml-pipeline/google/pipelines/argoexecutor:$TAG_NAME']
484+
args: ['tag', 'gcr.io/ml-pipeline/argoexec:v3.3.8-license-compliance', 'gcr.io/ml-pipeline/google/pipelines/argoexecutor:$TAG_NAME']
485485
id: 'tagArgoExecutorForMarketplace'
486486
waitFor: ['pullArgoExecutor']
487487
- name: 'gcr.io/cloud-builders/docker'
488-
args: ['tag', 'gcr.io/ml-pipeline/argoexec:v3.2.3-license-compliance', 'gcr.io/ml-pipeline/google/pipelines-test/argoexecutor:$TAG_NAME']
488+
args: ['tag', 'gcr.io/ml-pipeline/argoexec:v3.3.8-license-compliance', 'gcr.io/ml-pipeline/google/pipelines-test/argoexecutor:$TAG_NAME']
489489
id: 'tagArgoExecutorForMarketplaceTest'
490490
waitFor: ['pullArgoExecutor']
491491
- id: 'tagArgoExecutorForMarketplaceMajorMinor'
@@ -495,20 +495,20 @@ steps:
495495
args:
496496
- -ceux
497497
- |
498-
docker tag gcr.io/ml-pipeline/argoexec:v3.2.3-license-compliance gcr.io/ml-pipeline/google/pipelines/argoexecutor:$(cat /workspace/mm.ver)
499-
docker tag gcr.io/ml-pipeline/argoexec:v3.2.3-license-compliance gcr.io/ml-pipeline/google/pipelines-test/argoexecutor:$(cat /workspace/mm.ver)
498+
docker tag gcr.io/ml-pipeline/argoexec:v3.3.8-license-compliance gcr.io/ml-pipeline/google/pipelines/argoexecutor:$(cat /workspace/mm.ver)
499+
docker tag gcr.io/ml-pipeline/argoexec:v3.3.8-license-compliance gcr.io/ml-pipeline/google/pipelines-test/argoexecutor:$(cat /workspace/mm.ver)
500500
docker push gcr.io/ml-pipeline/google/pipelines/argoexecutor:$(cat /workspace/mm.ver)
501501
docker push gcr.io/ml-pipeline/google/pipelines-test/argoexecutor:$(cat /workspace/mm.ver)
502502
503503
- name: 'gcr.io/cloud-builders/docker'
504-
args: ['pull', 'gcr.io/ml-pipeline/workflow-controller:v3.2.3-license-compliance']
504+
args: ['pull', 'gcr.io/ml-pipeline/workflow-controller:v3.3.8-license-compliance']
505505
id: 'pullArgoWorkflowController'
506506
- name: 'gcr.io/cloud-builders/docker'
507-
args: ['tag', 'gcr.io/ml-pipeline/workflow-controller:v3.2.3-license-compliance', 'gcr.io/ml-pipeline/google/pipelines/argoworkflowcontroller:$TAG_NAME']
507+
args: ['tag', 'gcr.io/ml-pipeline/workflow-controller:v3.3.8-license-compliance', 'gcr.io/ml-pipeline/google/pipelines/argoworkflowcontroller:$TAG_NAME']
508508
id: 'tagArgoWorkflowControllerForMarketplace'
509509
waitFor: ['pullArgoWorkflowController']
510510
- name: 'gcr.io/cloud-builders/docker'
511-
args: ['tag', 'gcr.io/ml-pipeline/workflow-controller:v3.2.3-license-compliance', 'gcr.io/ml-pipeline/google/pipelines-test/argoworkflowcontroller:$TAG_NAME']
511+
args: ['tag', 'gcr.io/ml-pipeline/workflow-controller:v3.3.8-license-compliance', 'gcr.io/ml-pipeline/google/pipelines-test/argoworkflowcontroller:$TAG_NAME']
512512
id: 'tagArgoWorkflowControllerForMarketplaceTest'
513513
waitFor: ['pullArgoWorkflowController']
514514
- id: 'tagArgoWorkflowControllerForMarketplaceMajorMinor'
@@ -518,8 +518,8 @@ steps:
518518
args:
519519
- -ceux
520520
- |
521-
docker tag gcr.io/ml-pipeline/workflow-controller:v3.2.3-license-compliance gcr.io/ml-pipeline/google/pipelines/argoworkflowcontroller:$(cat /workspace/mm.ver)
522-
docker tag gcr.io/ml-pipeline/workflow-controller:v3.2.3-license-compliance gcr.io/ml-pipeline/google/pipelines-test/argoworkflowcontroller:$(cat /workspace/mm.ver)
521+
docker tag gcr.io/ml-pipeline/workflow-controller:v3.3.8-license-compliance gcr.io/ml-pipeline/google/pipelines/argoworkflowcontroller:$(cat /workspace/mm.ver)
522+
docker tag gcr.io/ml-pipeline/workflow-controller:v3.3.8-license-compliance gcr.io/ml-pipeline/google/pipelines-test/argoworkflowcontroller:$(cat /workspace/mm.ver)
523523
docker push gcr.io/ml-pipeline/google/pipelines/argoworkflowcontroller:$(cat /workspace/mm.ver)
524524
docker push gcr.io/ml-pipeline/google/pipelines-test/argoworkflowcontroller:$(cat /workspace/mm.ver)
525525

.tekton/pipeline.yaml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -607,6 +607,52 @@ spec:
607607
workspaces:
608608
- name: task-pvc
609609
workspace: pipeline-pvc
610+
- name: e2e-test-cond-dep
611+
retries: 1
612+
taskRef:
613+
name: e2e-test
614+
runAfter:
615+
- deploy
616+
- deploy-pipeline-loops-e2e
617+
params:
618+
- name: apikey
619+
value: $(params.apikey)
620+
- name: kubernetes-cluster
621+
value: $(params.kubernetes-cluster)
622+
- name: kubeflow-ns
623+
value: $(params.kubeflow-ns)
624+
- name: slack-webhook
625+
value: $(params.slack-webhook)
626+
- name: slack-channel
627+
value: $(params.slack-channel)
628+
- name: test-script
629+
value: "scripts/deploy/iks/test-condition-depend.sh"
630+
workspaces:
631+
- name: task-pvc
632+
workspace: pipeline-pvc
633+
- name: e2e-test-cache
634+
retries: 1
635+
taskRef:
636+
name: e2e-test
637+
runAfter:
638+
- deploy
639+
- deploy-pipeline-loops-e2e
640+
params:
641+
- name: apikey
642+
value: $(params.apikey)
643+
- name: kubernetes-cluster
644+
value: $(params.kubernetes-cluster)
645+
- name: kubeflow-ns
646+
value: $(params.kubeflow-ns)
647+
- name: slack-webhook
648+
value: $(params.slack-webhook)
649+
- name: slack-channel
650+
value: $(params.slack-channel)
651+
- name: test-script
652+
value: "scripts/deploy/iks/test-cache.sh"
653+
workspaces:
654+
- name: task-pvc
655+
workspace: pipeline-pvc
610656
- name: e2e-test-trusted-ai
611657
retries: 1
612658
taskRef:

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ For more details about the project please follow this detailed [blog post](https
1414

1515
## Architecture
1616

17-
We are currently using [Kubeflow Pipelines 1.8.1](https://github.com/kubeflow/pipelines/releases/tag/1.8.1) and
18-
[Tekton >= 0.36.0](https://github.com/tektoncd/pipeline/releases/tag/v0.36.0)
17+
We are currently using [Kubeflow Pipelines 1.8.4](https://github.com/kubeflow/pipelines/releases/tag/1.8.4) and
18+
[Tekton >= 0.38.3](https://github.com/tektoncd/pipeline/releases/tag/v0.38.3)
1919
for this project.
2020

2121
![kfp-tekton](images/kfp-tekton.png)

backend/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ RUN set -e; \
5959

6060

6161
# 3. Start api web server
62-
FROM debian:stretch
62+
FROM debian:stable
6363

6464
ARG COMMIT_SHA=unknown
6565
ENV COMMIT_SHA=${COMMIT_SHA}

backend/README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,11 @@ need to be regenerated and checked-in. Refer to [backend/api](./api/README.md) f
4747

4848
## Updating licenses info
4949

50-
1. Install go-licenses tool from https://github.com/Bobgy/go-licenses/releases,
51-
and refer to its documentation for how to use it.
50+
1. Install go-licenses tool and refer to [its documentation](https://github.com/google/go-licenses) for how to use it.
51+
52+
```bash
53+
go install github.com/google/go-licenses@d483853
54+
```
5255

5356
2. Run the tool to update all licenses:
5457

backend/api/python_http_client/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ This file contains REST API specification for Kubeflow Pipelines. The file is au
33

44
This Python package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
55

6-
- API version: 1.8.1
7-
- Package version: 1.8.1
6+
- API version: 1.8.4
7+
- Package version: 1.8.4
88
- Build package: org.openapitools.codegen.languages.PythonClientCodegen
99
For more information, please visit [https://www.google.com](https://www.google.com)
1010

backend/api/python_http_client/kfp_server_api/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
from __future__ import absolute_import
1616

17-
__version__ = "1.8.1"
17+
__version__ = "1.8.4"
1818

1919
# import apis into sdk package
2020
from kfp_server_api.api.experiment_service_api import ExperimentServiceApi

backend/api/python_http_client/kfp_server_api/api_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
7878
self.default_headers[header_name] = header_value
7979
self.cookie = cookie
8080
# Set default User-Agent.
81-
self.user_agent = 'OpenAPI-Generator/1.8.1/python'
81+
self.user_agent = 'OpenAPI-Generator/1.8.4/python'
8282
self.client_side_validation = configuration.client_side_validation
8383

8484
def __enter__(self):

backend/api/python_http_client/kfp_server_api/configuration.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,8 +351,8 @@ def to_debug_report(self):
351351
return "Python SDK Debug Report:\n"\
352352
"OS: {env}\n"\
353353
"Python Version: {pyversion}\n"\
354-
"Version of the API: 1.8.1\n"\
355-
"SDK Package Version: 1.8.1".\
354+
"Version of the API: 1.8.4\n"\
355+
"SDK Package Version: 1.8.4".\
356356
format(env=sys.platform, pyversion=sys.version)
357357

358358
def get_host_settings(self):

0 commit comments

Comments
 (0)