Skip to content

Commit

Permalink
Merge kserve to main branch (kubeflow#1811)
Browse files Browse the repository at this point in the history
* Change e2e test job to point to kserve repo

* Fix prow config

* Remove dir dep

* fix image-transformer built image tag (kubeflow#44)

* fix image-transformer built image tag

Signed-off-by: Theofilos Papapanagiotou <theofilos@gmail.com>

* rename ecr registry directory for kserve

Signed-off-by: Theofilos Papapanagiotou <theofilos@gmail.com>

* merging kserve branch to master (kubeflow#35)

* KServe Go module and API group change
--------------------------------------

Updated go source files with new go module.
Changed apigroup in yaml files.
Made changes in Makefile to represent the repository and apigroup names.

Verified `make test` is passing.

Removed reference for old names.

* Pointed correct repo reference for ko images (kubeflow#23)

* Rename changes python - New (kubeflow#19)

* python changes-initial-commit

* updated api gen.
Renamed package references in python.

* Renamed python/kfserving to python/kserve

* renamed python folder according to package kserve

* Ran client-gen. Updated swagger.json

* renamed constants from KFSERVING_ to KSERVE_.
Yet to change namespace from kfserving-system to kserve and hence not changed in python side.

* Updated kfserving reference to kserve
Updated version for Python Package Index to 0.7.0rc0
Renamed KFServingSampleModel to KServeSampleModel

* Python package and corresponding directory change has to be reflected in test and dockerfiles

* updated a specific version in requirments to address issue with pip resolver.
Added more specific versions in requirements,txt and updated paddleserver setup.py with kserve dependency.

* Changed namespace from kfserving-system to kserve (kubeflow#31)

* Update local dev scripts (kubeflow#33)

* initial commit of dev-scripts update

* Updated quick-install

* Updated python Makefile

* Generated install for new release

* Updated generate-install script with new release

* Reverting controller name in makefile.
Will be updated in separate pr.

* Github action changes (kubeflow#34)

* Github action changes

Migrated images publish to kserve repo.
Added github workflows for the ones that was being pushed to gcr.io from release/triggers.

* Removed batcher publisher since batcher.Dockerfile does not exist
Updated tf2openapi.Dockerfile  to correct directory and package.

* Fixed issue with working directory of tf2openapi workflow

* Removed the deptrecated logger docker

* Excluded tests from linting. (kubeflow#36)

They were pointing to older directory and package names and
hence were not being excluded while linting.

* Update license (kubeflow#20)

* Fixed errors thrown by flake8 linter (kubeflow#37)

* Kfserving kserve manifests changes and code reference changes (kubeflow#39)

* kfserving -> kserve migartion initial commit

* kfserving -> kserve config changes

* Changed constants.
Updated image reference from kserve to andyarok

* Reverted kserve models web app  image repo.

* go changes for kfserving-kserve

* Updated KFServing refernce in python code

* Updated KFServing to KServe in python doc comments.
Updated references of v1alpha2 from duplicate aliases to just use pkg name.
Updated docs samples references with proper name.
Made changes to use Constant for container name instead of literal "kserve-container".

* Updated gitignore for generated files that came in after folder rename.
Removed the generated files.
Fixed lint warnings for go.

* Removed travis yml file.

* KServe doc update (kubeflow#38)

* Update main and pythonserver readme

* Update python docs

* Fix role binding

* Update kserve sdk doc

* Fix e2e test script

* Fix import

* Kserve error fix (kubeflow#40)

* Fixed linting errors in python

* Fixed make test.
Issue with storage initializer name/path.

* Fixed failing python test.
Updated ray version.
Updated KFServingClient reference to KServeClient in kserve init.

* Updated ray version from 1.4.0 to 1.5.0

* Fixed error with e2e due to kfserving reference in test overlay (kubeflow#42)

Updated quick install and added 0.7.0-rc0 install manifests.
Updated e2e namespace.

* Controller repo update (kubeflow#45)

Made changes in workflow to update image repo to kserve instead of kfserving

* Controller repo update (kubeflow#45)

Made changes in workflow to update image repo to kserve instead of kfserving

* update pytorch image

* Fix transformer dockerfile

Co-authored-by: Andrews Arokiam <andrews.arokiam@ideas2it.com>
Co-authored-by: andyi2it <87992092+andyi2it@users.noreply.github.com>

* Generate 0.7.0 release candidate and update roadmap/release process (kubeflow#46)

* Fix apiVersion for examples and docs (kubeflow#55)

Fix apiVersion for examples and docs change from serving.kubeflow.org
to serving.kserve.io

* add default deployment and fix startup without knative to master branch (kubeflow#57)

* add default deployment and fix startup without knative

* fix suite_test error

* fix suit_test error

* add constant vb for RawDeployment and Serverless

* update predictor string RawDeployment to constants.RawDeployment

* modify getDeploymentMode return type

* Update kserve layer diagram (kubeflow#58)

* update diag (kubeflow#59)

* Remove kubeflow copyright (kubeflow#56)

* Adding kfs_architect.drawio and changing kfs_architect.png's "KFserving" name to "KServe" (kubeflow#60)

* Delete kfs_architect.png

* Add files via upload

Adding kfs_architect.drawio and changing kfs_architect.png's "KFserving" name to "KServe"

* Delete kfs_architect.png

* Delete kfs_architect.drawio

* added Metric scrapping title

* Delete kfs_architect.png

* Delete kfs_architect.drawio

* fixed typo

* add Nick Hill as a reviewer (kubeflow#66)

also removing rkelkar

* Separate out web-app repo (kubeflow#68)

* Sepate out web-app repo

* Remove models web-app github action

* Fix feast example

Co-authored-by: Theofilos Papapanagiotou <theofilos@gmail.com>
Co-authored-by: Andrews Arokiam <andrews.arokiam@ideas2it.com>
Co-authored-by: andyi2it <87992092+andyi2it@users.noreply.github.com>
Co-authored-by: Chin Huang <chhuang@us.ibm.com>
Co-authored-by: Qingshan Chen <38182824+Iamlovingit@users.noreply.github.com>
Co-authored-by: Animesh Singh <singhan@us.ibm.com>
Co-authored-by: js-ts <79689323+js-ts@users.noreply.github.com>
  • Loading branch information
8 people authored Sep 23, 2021
1 parent 14707b4 commit 638fff6
Show file tree
Hide file tree
Showing 1,043 changed files with 86,631 additions and 35,243 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/agent-docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:

- name: Push image
run: |
IMAGE_ID=kfserving/$IMAGE_NAME
IMAGE_ID=kserve/$IMAGE_NAME
# Change all uppercase to lowercase
IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/aiexplainer-docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:

- name: Push image
run: |
IMAGE_ID=kfserving/$IMAGE_NAME
IMAGE_ID=kserve/$IMAGE_NAME
# Change all uppercase to lowercase
IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/alibiexplainer-docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:

- name: Push image
run: |
IMAGE_ID=kfserving/$IMAGE_NAME
IMAGE_ID=kserve/$IMAGE_NAME
# Change all uppercase to lowercase
IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/artexplainer-docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:

- name: Push image
run: |
IMAGE_ID=kfserving/$IMAGE_NAME
IMAGE_ID=kserve/$IMAGE_NAME
# Change all uppercase to lowercase
IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Models web app Docker Publisher
name: Kserve controller Docker Publisher

on:
push:
Expand All @@ -14,7 +14,7 @@ on:
pull_request:

env:
IMAGE_NAME: models-web-app
IMAGE_NAME: kserve-controller

jobs:
# Run tests.
Expand All @@ -31,7 +31,6 @@ jobs:
docker-compose --file docker-compose.test.yml build
docker-compose --file docker-compose.test.yml run sut
else
cd web-app
docker build . --file Dockerfile
fi
Expand All @@ -49,15 +48,14 @@ jobs:

- name: Build image
run: |
cd web-app
docker build . --file Dockerfile --tag $IMAGE_NAME
- name: Log into registry
run: docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASSWORD }}

- name: Push image
run: |
IMAGE_ID=kfserving/$IMAGE_NAME
IMAGE_ID=kserve/$IMAGE_NAME
# Change all uppercase to lowercase
IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lightgbm-docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:

- name: Push image
run: |
IMAGE_ID=kfserving/$IMAGE_NAME
IMAGE_ID=kserve/$IMAGE_NAME
# Change all uppercase to lowercase
IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/paddle-docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:

- name: Push image
run: |
IMAGE_ID=kfserving/$IMAGE_NAME
IMAGE_ID=kserve/$IMAGE_NAME
# Change all uppercase to lowercase
IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pmml-docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:

- name: Push image
run: |
IMAGE_ID=kfserving/$IMAGE_NAME
IMAGE_ID=kserve/$IMAGE_NAME
# Change all uppercase to lowercase
IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ jobs:
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
run: |
cd python/kfserving
cd python/kserve
python setup.py sdist bdist_wheel
twine upload dist/*
4 changes: 2 additions & 2 deletions .github/workflows/python-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
uses: py-actions/flake8@v1
with:
max-line-length: "120"
exclude: "docs/samples/v1alpha2/onnx/assets/*.py,python/kfserving/test/test_v1*.py,python/kfserving/kfserving/__init__.py,python/kfserving/test/test_knative*.py"
exclude: "docs/samples/v1alpha2/onnx/assets/*.py,python/kserve/test/test_v1*.py,python/kserve/kserve/__init__.py,python/kserve/test/test_knative*.py"
build:
runs-on: ubuntu-latest
strategy:
Expand All @@ -41,7 +41,7 @@ jobs:
pip install pytest-cov
pip install --upgrade pytest-tornasync
cd python
pip install -e ./kfserving
pip install -e ./kserve
pip install -e ./aixexplainer
pip install -e ./alibiexplainer
pip install h5py==2.9.0
Expand Down
79 changes: 79 additions & 0 deletions .github/workflows/pytorchserver-docker-publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
name: Pytorch Server Docker Publisher

on:
push:
# Publish `master` as Docker `latest` image.
branches:
- master

# Publish `v1.2.3` tags as releases.
tags:
- v*

# Run tests for any PRs.
pull_request:

env:
IMAGE_NAME: pytorchserver

jobs:
# Run tests.
# See also https://docs.docker.com/docker-hub/builds/automated-testing/
test:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: Run tests
run: |
if [ -f docker-compose.test.yml ]; then
docker-compose --file docker-compose.test.yml build
docker-compose --file docker-compose.test.yml run sut
else
cd python
docker build . --file pytorch.Dockerfile
fi
# Push image to GitHub Packages.
# See also https://docs.docker.com/docker-hub/builds/
push:
# Ensure test job passes before pushing image.
needs: test

runs-on: ubuntu-latest
if: github.event_name == 'push'

steps:
- uses: actions/checkout@v2

- name: Build image
run: |
cd python
docker build . --file pytorch.Dockerfile --tag $IMAGE_NAME
- name: Log into registry
run: docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASSWORD }}

- name: Push image
run: |
IMAGE_ID=kserve/$IMAGE_NAME
# Change all uppercase to lowercase
IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
# Strip git ref prefix from version
VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
# Strip "v" prefix from tag name
# [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
# Use Docker `latest` tag convention
[ "$VERSION" == "master" ] && VERSION=latest
echo IMAGE_ID=$IMAGE_ID
echo VERSION=$VERSION
docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
docker push $IMAGE_ID:$VERSION
82 changes: 82 additions & 0 deletions .github/workflows/pytorchserver-gpu-docker-publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
name: Pytorch Server gpu Docker Publisher

on:
push:
# Publish `master` as Docker `latest` image.
branches:
- master

# Publish `v1.2.3` tags as releases.
tags:
- v*

# Run tests for any PRs.
pull_request:

env:
IMAGE_NAME: pytorchserver

jobs:
# Run tests.
# See also https://docs.docker.com/docker-hub/builds/automated-testing/
test:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: Run tests
run: |
if [ -f docker-compose.test.yml ]; then
docker-compose --file docker-compose.test.yml build
docker-compose --file docker-compose.test.yml run sut
else
cd python
docker build . --file pytorch-gpu.Dockerfile
fi
# Push image to GitHub Packages.
# See also https://docs.docker.com/docker-hub/builds/
push:
# Ensure test job passes before pushing image.
needs: test

runs-on: ubuntu-latest
if: github.event_name == 'push'

steps:
- uses: actions/checkout@v2

- name: Build image
run: |
cd python
docker build . --file pytorch-gpu.Dockerfile --tag $IMAGE_NAME
- name: Log into registry
run: docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASSWORD }}

- name: Push image
run: |
IMAGE_ID=kserve/$IMAGE_NAME
# Change all uppercase to lowercase
IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
# Strip git ref prefix from version
VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
# Strip "v" prefix from tag name
# [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
# Use Docker `latest` tag convention
[ "$VERSION" == "master" ] && VERSION=latest
#appending gpu for version
VERSION=$VERSION-gpu
echo IMAGE_ID=$IMAGE_ID
echo VERSION=$VERSION
docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
docker push $IMAGE_ID:$VERSION
79 changes: 79 additions & 0 deletions .github/workflows/sklearnserver-docker-publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
name: Sklearn Server Docker Publisher

on:
push:
# Publish `master` as Docker `latest` image.
branches:
- master

# Publish `v1.2.3` tags as releases.
tags:
- v*

# Run tests for any PRs.
pull_request:

env:
IMAGE_NAME: sklearnserver

jobs:
# Run tests.
# See also https://docs.docker.com/docker-hub/builds/automated-testing/
test:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: Run tests
run: |
if [ -f docker-compose.test.yml ]; then
docker-compose --file docker-compose.test.yml build
docker-compose --file docker-compose.test.yml run sut
else
cd python
docker build . --file sklearn.Dockerfile
fi
# Push image to GitHub Packages.
# See also https://docs.docker.com/docker-hub/builds/
push:
# Ensure test job passes before pushing image.
needs: test

runs-on: ubuntu-latest
if: github.event_name == 'push'

steps:
- uses: actions/checkout@v2

- name: Build image
run: |
cd python
docker build . --file sklearn.Dockerfile --tag $IMAGE_NAME
- name: Log into registry
run: docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASSWORD }}

- name: Push image
run: |
IMAGE_ID=kserve/$IMAGE_NAME
# Change all uppercase to lowercase
IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
# Strip git ref prefix from version
VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
# Strip "v" prefix from tag name
# [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
# Use Docker `latest` tag convention
[ "$VERSION" == "master" ] && VERSION=latest
echo IMAGE_ID=$IMAGE_ID
echo VERSION=$VERSION
docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
docker push $IMAGE_ID:$VERSION
Loading

0 comments on commit 638fff6

Please sign in to comment.