Skip to content

Commit

Permalink
sync with kfp 2.0.2 release
Browse files Browse the repository at this point in the history
  • Loading branch information
Tomcli committed Oct 12, 2023
2 parents ec56e80 + efe630c commit add6aed
Show file tree
Hide file tree
Showing 757 changed files with 175,190 additions and 22,097 deletions.
2 changes: 1 addition & 1 deletion .cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ steps:
# * manifests/kustomize/base/metadata/base/metadata-grpc-deployment.yaml
# * test/tag_for_hosted.sh
- name: 'gcr.io/cloud-builders/docker'
args: ['pull', 'gcr.io/tfx-oss-public/ml_metadata_store_server:1.5.0']
args: ['pull', 'gcr.io/tfx-oss-public/ml_metadata_store_server:1.14.0']
id: 'pullMetadataServer'
- name: 'gcr.io/cloud-builders/docker'
args: ['pull', 'gcr.io/ml-pipeline/minio:RELEASE.2019-08-14T20-37-41Z-license-compliance']
Expand Down
2 changes: 1 addition & 1 deletion .github/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ markComment: >
# Comment to post when closing a stale issue. Set to `false` to disable
closeComment: >
This issue has been automatically closed because it has not had recent
activity. Please comment "/reopen" to reopen it.
activity. Please comment "/reopen" to reopen it.
39 changes: 39 additions & 0 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
#
# You can adjust the behavior by modifying this file.
# For more information, see:
# https://github.com/actions/stale
name: Mark stale issues and pull requests

on:
schedule:
- cron: '39 7 * * *'

jobs:
stale:

runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write

steps:
- uses: actions/stale@v5
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
days-before-stale: -1
days-before-close: -1
days-before-issue-stale: 90
days-before-issue-close: 90
stale-issue-message: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs. Thank you
for your contributions.
close-issue-message: >
This issue has been automatically closed because it has not had recent
activity. Please comment "/reopen" to reopen it.
stale-issue-label: 'lifecycle/stale'
exempt-issue-labels: lifecycle/frozen
exempt-pr-labels: lifecycle/frozen
# Learn more about operations: https://github.com/actions/stale#operations-per-run.
operations-per-run: 200
10 changes: 5 additions & 5 deletions .release.cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -259,14 +259,14 @@ steps:
# * manifests/kustomize/base/metadata/base/metadata-grpc-deployment.yaml
# * test/tag_for_hosted.sh
- name: 'gcr.io/cloud-builders/docker'
args: ['pull', 'gcr.io/tfx-oss-public/ml_metadata_store_server:1.5.0']
args: ['pull', 'gcr.io/tfx-oss-public/ml_metadata_store_server:1.14.0']
id: 'pullMetadataServer'
- name: 'gcr.io/cloud-builders/docker'
args: ['tag', 'gcr.io/tfx-oss-public/ml_metadata_store_server:1.5.0', 'gcr.io/ml-pipeline/google/pipelines/metadataserver:$TAG_NAME']
args: ['tag', 'gcr.io/tfx-oss-public/ml_metadata_store_server:1.14.0', 'gcr.io/ml-pipeline/google/pipelines/metadataserver:$TAG_NAME']
id: 'tagMetadataServerForMarketplace'
waitFor: ['pullMetadataServer']
- name: 'gcr.io/cloud-builders/docker'
args: ['tag', 'gcr.io/tfx-oss-public/ml_metadata_store_server:1.5.0', 'gcr.io/ml-pipeline/google/pipelines-test/metadataserver:$TAG_NAME']
args: ['tag', 'gcr.io/tfx-oss-public/ml_metadata_store_server:1.14.0', 'gcr.io/ml-pipeline/google/pipelines-test/metadataserver:$TAG_NAME']
id: 'tagMetadataServerForMarketplaceTest'
waitFor: ['pullMetadataServer']
- id: 'tagMetadataServerForMarketplaceMajorMinor'
Expand All @@ -276,8 +276,8 @@ steps:
args:
- -ceux
- |
docker tag gcr.io/tfx-oss-public/ml_metadata_store_server:1.5.0 gcr.io/ml-pipeline/google/pipelines/metadataserver:$(cat /workspace/mm.ver)
docker tag gcr.io/tfx-oss-public/ml_metadata_store_server:1.5.0 gcr.io/ml-pipeline/google/pipelines-test/metadataserver:$(cat /workspace/mm.ver)
docker tag gcr.io/tfx-oss-public/ml_metadata_store_server:1.14.0 gcr.io/ml-pipeline/google/pipelines/metadataserver:$(cat /workspace/mm.ver)
docker tag gcr.io/tfx-oss-public/ml_metadata_store_server:1.14.0 gcr.io/ml-pipeline/google/pipelines-test/metadataserver:$(cat /workspace/mm.ver)
docker push gcr.io/ml-pipeline/google/pipelines/metadataserver:$(cat /workspace/mm.ver)
docker push gcr.io/ml-pipeline/google/pipelines-test/metadataserver:$(cat /workspace/mm.ver)
Expand Down
129 changes: 129 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.0
2.0.2
2 changes: 1 addition & 1 deletion backend/Dockerfile.driver
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM golang:1.20.4-alpine3.17 as builder
FROM golang:1.20.9-alpine3.17 as builder

WORKDIR /go/src/github.com/kubeflow/pipelines
COPY . .
Expand Down
2 changes: 1 addition & 1 deletion backend/Dockerfile.launcher
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM golang:1.20.4-alpine3.17 as builder
FROM golang:1.20.9-alpine3.17 as builder

WORKDIR /go/src/github.com/kubeflow/pipelines
COPY . .
Expand Down
2 changes: 1 addition & 1 deletion backend/Dockerfile.visualization
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# and exporter.py files in the directory specified above.

# This image should be in sync with image in backend/src/apiserver/visualization/update_requirements.sh.
FROM tensorflow/tensorflow:2.5.1
FROM tensorflow/tensorflow:2.10.1

RUN apt-get update \
&& apt-get install -y wget curl tar openssl
Expand Down
12 changes: 11 additions & 1 deletion backend/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ CSV_PATH=backend/third_party_licenses
# Whenever build command for any of the binaries change, we should update them both here and in backend/Dockerfiles.

.PHONY: all
all: license_apiserver license_persistence_agent license_cache_server license_swf license_viewer tekton_licenses
all: license_apiserver license_persistence_agent license_cache_server license_swf license_viewer tekton_licenses license_driver license_launcher

.PHONY: tekton_licenses
tekton_licenses: license_tekton_driver license_tekton_ehc license_tekton_ehw license_tekton_ktc license_tekton_ktw
Expand Down Expand Up @@ -34,6 +34,10 @@ $(BUILD)/license_tekton_ktc:
GO111MODULE=on go build -o $(BUILD)/license_tekton_ktc github.com/kubeflow/pipelines/backend/src/v2/cmd/tekton-kfptask/controller
$(BUILD)/license_tekton_ktw:
GO111MODULE=on go build -o $(BUILD)/license_tekton_ktw github.com/kubeflow/pipelines/backend/src/v2/cmd/tekton-kfptask/webhook
$(BUILD)/driver:
GO111MODULE=on go build -o $(BUILD)/driver github.com/kubeflow/pipelines/backend/src/v2/cmd/driver
$(BUILD)/launcher:
GO111MODULE=on go build -o $(BUILD)/launcher github.com/kubeflow/pipelines/backend/src/v2/cmd/launcher-v2

# Update licenses info after dependencies changed.
# See README.md#updating-licenses-info section for more details.
Expand Down Expand Up @@ -67,6 +71,12 @@ license_tekton_ktc: $(BUILD)/license_tekton_ktc
.PHONY: license_tekton_ktw
license_tekton_ktw: $(BUILD)/license_tekton_ktw
cd $(MOD_ROOT) && go-licenses csv ./backend/src/v2/cmd/tekton-kfptask/webhook > $(CSV_PATH)/tekton-kfptask-webhook.csv
.PHONY: license_driver
license_driver: $(BUILD)/driver
cd $(MOD_ROOT) && go-licenses csv ./backend/src/v2/cmd/driver > $(CSV_PATH)/driver.csv
.PHONY: license_launcher
license_launcher: $(BUILD)/launcher
cd $(MOD_ROOT) && go-licenses csv ./backend/src/v2/cmd/launcher-v2 > $(CSV_PATH)/launcher.csv

.PHONY: image_all
image_all: image_apiserver image_persistence_agent image_cache image_swf image_viewer image_visualization
Expand Down
7 changes: 7 additions & 0 deletions backend/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,13 @@ need to be regenerated and checked-in. Refer to [backend/api](./api/README.md) f
make all
```

## Updating python dependencies

[pip-tools](https://github.com/jazzband/pip-tools) is used to manage python
dependencies. To update dependencies, edit [requirements.in](requirements.in)
and run `./update_requirements.sh` to update and pin the transitive
dependencies.

# Visualization Server Instructions

## Updating python dependencies
Expand Down
4 changes: 2 additions & 2 deletions backend/api/v1beta1/python_http_client/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ This file contains REST API specification for Kubeflow Pipelines. The file is au

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

- API version: 2.0.0
- Package version: 2.0.0
- API version: 2.0.2
- Package version: 2.0.2
- Build package: org.openapitools.codegen.languages.PythonClientCodegen
For more information, please visit [https://www.google.com](https://www.google.com)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

from __future__ import absolute_import

__version__ = "2.0.0"
__version__ = "2.0.2"

# import apis into sdk package
from kfp_server_api.api.experiment_service_api import ExperimentServiceApi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
self.default_headers[header_name] = header_value
self.cookie = cookie
# Set default User-Agent.
self.user_agent = 'OpenAPI-Generator/2.0.0/python'
self.user_agent = 'OpenAPI-Generator/2.0.2/python'
self.client_side_validation = configuration.client_side_validation

def __enter__(self):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -351,8 +351,8 @@ def to_debug_report(self):
return "Python SDK Debug Report:\n"\
"OS: {env}\n"\
"Python Version: {pyversion}\n"\
"Version of the API: 2.0.0\n"\
"SDK Package Version: 2.0.0".\
"Version of the API: 2.0.2\n"\
"SDK Package Version: 2.0.2".\
format(env=sys.platform, pyversion=sys.version)

def get_host_settings(self):
Expand Down
2 changes: 1 addition & 1 deletion backend/api/v1beta1/python_http_client/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from setuptools import setup, find_packages # noqa: H301

NAME = "kfp-server-api"
VERSION = "2.0.0"
VERSION = "2.0.2"
# To install the library, run the following
#
# python setup.py install
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"swagger": "2.0",
"info": {
"title": "Kubeflow Pipelines API",
"version": "2.0.0",
"version": "2.0.2",
"description": "This file contains REST API specification for Kubeflow Pipelines. The file is autogenerated from the swagger definition.",
"contact": {
"name": "google",
Expand Down
4 changes: 2 additions & 2 deletions backend/api/v2beta1/python_http_client/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ This file contains REST API specification for Kubeflow Pipelines. The file is au

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

- API version: 2.0.0
- Package version: 2.0.0
- API version: 2.0.2
- Package version: 2.0.2
- Build package: org.openapitools.codegen.languages.PythonClientCodegen
For more information, please visit [https://www.google.com](https://www.google.com)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

from __future__ import absolute_import

__version__ = "2.0.0"
__version__ = "2.0.2"

# import apis into sdk package
from kfp_server_api.api.auth_service_api import AuthServiceApi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
self.default_headers[header_name] = header_value
self.cookie = cookie
# Set default User-Agent.
self.user_agent = 'OpenAPI-Generator/2.0.0/python'
self.user_agent = 'OpenAPI-Generator/2.0.2/python'
self.client_side_validation = configuration.client_side_validation

def __enter__(self):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -351,8 +351,8 @@ def to_debug_report(self):
return "Python SDK Debug Report:\n"\
"OS: {env}\n"\
"Python Version: {pyversion}\n"\
"Version of the API: 2.0.0\n"\
"SDK Package Version: 2.0.0".\
"Version of the API: 2.0.2\n"\
"SDK Package Version: 2.0.2".\
format(env=sys.platform, pyversion=sys.version)

def get_host_settings(self):
Expand Down
2 changes: 1 addition & 1 deletion backend/api/v2beta1/python_http_client/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from setuptools import setup, find_packages # noqa: H301

NAME = "kfp-server-api"
VERSION = "2.0.0"
VERSION = "2.0.2"
# To install the library, run the following
#
# python setup.py install
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"swagger": "2.0",
"info": {
"title": "Kubeflow Pipelines API",
"version": "2.0.0",
"version": "2.0.2",
"description": "This file contains REST API specification for Kubeflow Pipelines. The file is autogenerated from the swagger definition.",
"contact": {
"name": "google",
Expand Down
2 changes: 1 addition & 1 deletion backend/metadata_writer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ml-metadata package depends on tensorflow package
FROM python:3.7
FROM python:3.8
COPY backend/metadata_writer/requirements.txt /kfp/metadata_writer/
RUN python3 -m pip install -r /kfp/metadata_writer/requirements.txt

Expand Down
3 changes: 1 addition & 2 deletions backend/metadata_writer/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@

[pip-tools](https://github.com/jazzband/pip-tools) is used to manage python
dependencies. To update dependencies, edit [requirements.in](requirements.in)
and run `../update_requirements.sh python:3.7 <requirements.in >requirements.txt` to update and pin the transitive
and run `./update_requirements.sh` to update and pin the transitive
dependencies.

2 changes: 1 addition & 1 deletion backend/metadata_writer/requirements.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
kubernetes>=8.0.0,<11.0.0
ml-metadata==1.5.0
ml-metadata==1.14.0
lru-dict>=1.1.7,<2.0.0
85 changes: 60 additions & 25 deletions backend/metadata_writer/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,32 +1,67 @@
#
# This file is autogenerated by pip-compile
# To update, run:
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile --output-file=- -
#
absl-py==0.12.0 # via ml-metadata
attrs==20.3.0 # via ml-metadata
cachetools==5.0.0 # via google-auth
certifi==2021.10.8 # via kubernetes, requests
charset-normalizer==2.0.10 # via requests
google-auth==2.4.1 # via kubernetes
grpcio==1.43.0 # via ml-metadata
idna==3.3 # via requests
kubernetes==10.1.0 # via -r -
lru-dict==1.1.7 # via -r -
ml-metadata==1.5.0 # via -r -
oauthlib==3.1.1 # via requests-oauthlib
protobuf==3.19.3 # via ml-metadata
pyasn1-modules==0.2.8 # via google-auth
pyasn1==0.4.8 # via pyasn1-modules, rsa
python-dateutil==2.8.2 # via kubernetes
pyyaml==3.13 # via kubernetes
requests-oauthlib==1.3.0 # via kubernetes
requests==2.27.1 # via kubernetes, requests-oauthlib
rsa==4.8 # via google-auth
six==1.16.0 # via absl-py, google-auth, grpcio, kubernetes, ml-metadata, python-dateutil
urllib3==1.26.8 # via kubernetes, requests
websocket-client==1.2.3 # via kubernetes
absl-py==1.4.0
# via ml-metadata
attrs==21.4.0
# via ml-metadata
cachetools==5.3.1
# via google-auth
certifi==2023.7.22
# via
# kubernetes
# requests
charset-normalizer==3.2.0
# via requests
google-auth==2.23.0
# via kubernetes
grpcio==1.58.0
# via ml-metadata
idna==3.4
# via requests
kubernetes==10.1.0
# via -r -
lru-dict==1.2.0
# via -r -
ml-metadata==1.14.0
# via -r -
oauthlib==3.2.2
# via requests-oauthlib
protobuf==3.20.3
# via ml-metadata
pyasn1==0.5.0
# via
# pyasn1-modules
# rsa
pyasn1-modules==0.3.0
# via google-auth
python-dateutil==2.8.2
# via kubernetes
pyyaml==3.13
# via kubernetes
requests==2.31.0
# via
# kubernetes
# requests-oauthlib
requests-oauthlib==1.3.1
# via kubernetes
rsa==4.9
# via google-auth
six==1.16.0
# via
# kubernetes
# ml-metadata
# python-dateutil
urllib3==1.26.16
# via
# google-auth
# kubernetes
# requests
websocket-client==1.6.3
# via kubernetes

# The following packages are considered to be unsafe in a requirements file:
# setuptools
5 changes: 5 additions & 0 deletions backend/metadata_writer/update_requirements.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bash

# This image should be in sync with Dockerfile.
IMAGE="python:3.8"
../../hack/update-requirements.sh $IMAGE <requirements.in >requirements.txt
Loading

0 comments on commit add6aed

Please sign in to comment.