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

periodic sync upstream KF to midstream ODH #27

Merged
merged 7 commits into from
Mar 25, 2024
Merged

periodic sync upstream KF to midstream ODH #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
43efbe9
build(deps): bump google.golang.org/protobuf from 1.32.0 to 1.33.0 (#37)
dependabot[bot] Mar 12, 2024
67d9e4d
build(deps): bump google.golang.org/grpc from 1.62.0 to 1.62.1 (#38)
dependabot[bot] Mar 12, 2024
962c78d
OAS: fix minor issues and bump version (#29)
isinyaaa Mar 13, 2024
aeeffc0
add testing of KF MR Manifests (#36)
tarilabs Mar 14, 2024
cfb4712
build(deps): bump google.golang.org/protobuf from 1.32.0 to 1.33.0 in…
dependabot[bot] Mar 18, 2024
e9167d9
Revert skip "add testing of KF MR Manifests (kubeflow#36)"
tarilabs Mar 18, 2024
aa831d5
Merge branch 'odh-main' into tarilabs-20240318-midstreamsync
tarilabs Mar 18, 2024
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
92 changes: 46 additions & 46 deletions api/openapi/model-registry.yaml
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions csi/GET_STARTED.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ Then, in the same terminal where you exported `MR_HOSTNAME`, perform the followi

```bash
curl --silent -X 'POST' \
"$MR_HOSTNAME/api/model_registry/v1alpha2/registered_models" \
"$MR_HOSTNAME/api/model_registry/v1alpha3/registered_models" \
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know that we want to be back-compatible, but we do not have yet any stable released versions should we be changing the version numbers this aggressively? may be not right issue to ask this question either :(

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I recommend that if there are any API changes we update the version number only once for the given release. I am sure you might be already doing that, just wanted to understand.

Copy link
Member Author

@tarilabs tarilabs Mar 25, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, we can avoid "releasing too often", at the same time I understood we wanted to be strict on bumping the version number for every breaking change nevertheless.

Here is the short-blanket: either we minimize releases keeping the number bumps, or we release as often as needed and we relax strictness on the backward incompatibility of the REST API number. my2c.

-H 'accept: application/json' \
-H 'Content-Type: application/json' \
-d '{
Expand All @@ -100,7 +100,7 @@ Expected output:

```bash
curl --silent -X 'POST' \
"$MR_HOSTNAME/api/model_registry/v1alpha2/model_versions" \
"$MR_HOSTNAME/api/model_registry/v1alpha3/model_versions" \
-H 'accept: application/json' \
-H 'Content-Type: application/json' \
-d '{
Expand All @@ -121,7 +121,7 @@ This artifact defines where the actual trained model is stored, i.e., `gs://kfse

```bash
curl --silent -X 'POST' \
"$MR_HOSTNAME/api/model_registry/v1alpha2/model_versions/2/artifacts" \
"$MR_HOSTNAME/api/model_registry/v1alpha3/model_versions/2/artifacts" \
-H 'accept: application/json' \
-H 'Content-Type: application/json' \
-d '{
Expand Down Expand Up @@ -246,4 +246,4 @@ If you do not have DNS, you can still curl with the ingress gateway external IP
```bash
SERVICE_HOSTNAME=$(kubectl get inferenceservice iris-model -n kserve-test -o jsonpath='{.status.url}' | cut -d "/" -f 3)
curl -v -H "Host: ${SERVICE_HOSTNAME}" -H "Content-Type: application/json" "http://${INGRESS_HOST}:${INGRESS_PORT}/v1/models/iris-v1:predict" -d @/tmp/iris-input.json
```
```
2 changes: 1 addition & 1 deletion csi/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ require (
google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
google.golang.org/grpc v1.62.0 // indirect
google.golang.org/protobuf v1.32.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/api v0.28.4 // indirect
Expand Down
4 changes: 2 additions & 2 deletions csi/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,8 +305,8 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
Expand Down
24 changes: 12 additions & 12 deletions docs/logical_model.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ resulting in:

```
curl --silent -X 'GET' \
"$MR_HOSTNAME/api/model_registry/v1alpha2/registered_models/1" \
"$MR_HOSTNAME/api/model_registry/v1alpha3/registered_models/1" \
-H 'accept: application/json' | jq
{
"createTimeSinceEpoch": "1707765353963",
Expand All @@ -99,7 +99,7 @@ curl --silent -X 'GET' \
}

curl --silent -X 'GET' \
"$MR_HOSTNAME/api/model_registry/v1alpha2/registered_models/1/versions?pageSize=100&orderBy=ID&sortOrder=DESC&nextPageToken=" \
"$MR_HOSTNAME/api/model_registry/v1alpha3/registered_models/1/versions?pageSize=100&orderBy=ID&sortOrder=DESC&nextPageToken=" \
-H 'accept: application/json' | jq
{
"items": [
Expand All @@ -120,7 +120,7 @@ curl --silent -X 'GET' \
}

curl --silent -X 'GET' \
"$MR_HOSTNAME/api/model_registry/v1alpha2/model_versions/2/artifacts" \
"$MR_HOSTNAME/api/model_registry/v1alpha3/model_versions/2/artifacts" \
-H 'accept: application/json' | jq
{
"items": [
Expand Down Expand Up @@ -167,7 +167,7 @@ resulting in:

```
curl --silent -X 'GET' \
"$MR_HOSTNAME/api/model_registry/v1alpha2/registered_models/3" \
"$MR_HOSTNAME/api/model_registry/v1alpha3/registered_models/3" \
-H 'accept: application/json' | jq
{
"createTimeSinceEpoch": "1707765756856",
Expand All @@ -179,7 +179,7 @@ curl --silent -X 'GET' \
}

curl --silent -X 'GET' \
"$MR_HOSTNAME/api/model_registry/v1alpha2/registered_models/3/versions?pageSize=100&orderBy=ID&sortOrder=DESC&nextPageToken=" \
"$MR_HOSTNAME/api/model_registry/v1alpha3/registered_models/3/versions?pageSize=100&orderBy=ID&sortOrder=DESC&nextPageToken=" \
-H 'accept: application/json' | jq
{
"items": [
Expand All @@ -200,7 +200,7 @@ curl --silent -X 'GET' \
}

curl --silent -X 'GET' \
"$MR_HOSTNAME/api/model_registry/v1alpha2/model_versions/4/artifacts" \
"$MR_HOSTNAME/api/model_registry/v1alpha3/model_versions/4/artifacts" \
-H 'accept: application/json' | jq
{
"items": [
Expand Down Expand Up @@ -247,7 +247,7 @@ resulting in:

```
curl --silent -X 'GET' \
"$MR_HOSTNAME/api/model_registry/v1alpha2/registered_models/5" \
"$MR_HOSTNAME/api/model_registry/v1alpha3/registered_models/5" \
-H 'accept: application/json' | jq
{
"createTimeSinceEpoch": "1707765990857",
Expand All @@ -259,7 +259,7 @@ curl --silent -X 'GET' \
}

curl --silent -X 'GET' \
"$MR_HOSTNAME/api/model_registry/v1alpha2/registered_models/5/versions?pageSize=100&orderBy=ID&sortOrder=DESC&nextPageToken=" \
"$MR_HOSTNAME/api/model_registry/v1alpha3/registered_models/5/versions?pageSize=100&orderBy=ID&sortOrder=DESC&nextPageToken=" \
-H 'accept: application/json' | jq
{
"items": [
Expand Down Expand Up @@ -290,7 +290,7 @@ curl --silent -X 'GET' \
}

curl --silent -X 'GET' \
"$MR_HOSTNAME/api/model_registry/v1alpha2/model_versions/6/artifacts" \
"$MR_HOSTNAME/api/model_registry/v1alpha3/model_versions/6/artifacts" \
-H 'accept: application/json' | jq
{
"items": [
Expand Down Expand Up @@ -362,7 +362,7 @@ resulting in:

```
curl --silent -X 'GET' \
"$MR_HOSTNAME/api/model_registry/v1alpha2/registered_models/7" \
"$MR_HOSTNAME/api/model_registry/v1alpha3/registered_models/7" \
-H 'accept: application/json' | jq
{
"createTimeSinceEpoch": "1707766117250",
Expand All @@ -374,7 +374,7 @@ curl --silent -X 'GET' \
}

curl --silent -X 'GET' \
"$MR_HOSTNAME/api/model_registry/v1alpha2/registered_models/7/versions?pageSize=100&orderBy=ID&sortOrder=DESC&nextPageToken=" \
"$MR_HOSTNAME/api/model_registry/v1alpha3/registered_models/7/versions?pageSize=100&orderBy=ID&sortOrder=DESC&nextPageToken=" \
-H 'accept: application/json' | jq
{
"items": [
Expand All @@ -395,7 +395,7 @@ curl --silent -X 'GET' \
}

curl --silent -X 'GET' \
"$MR_HOSTNAME/api/model_registry/v1alpha2/model_versions/8/artifacts" \
"$MR_HOSTNAME/api/model_registry/v1alpha3/model_versions/8/artifacts" \
-H 'accept: application/json' | jq
{
"items": [
Expand Down
22 changes: 11 additions & 11 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,20 @@ require (
github.com/spf13/viper v1.18.2
github.com/stretchr/testify v1.9.0
github.com/testcontainers/testcontainers-go v0.26.0
google.golang.org/grpc v1.62.0
google.golang.org/protobuf v1.32.0
google.golang.org/grpc v1.62.1
google.golang.org/protobuf v1.33.0
)

require (
github.com/containerd/log v0.1.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.9.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
dario.cat/mergo v1.0.0 // indirect
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/Microsoft/hcsshim v0.11.4 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/containerd/containerd v1.7.13 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/cpuguy83/dockercfg v0.3.1 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/docker/distribution v2.8.2+incompatible // indirect
github.com/docker/docker v24.0.7+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
Expand All @@ -56,16 +49,22 @@ require (
github.com/opencontainers/runc v1.1.12 // indirect
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/shirou/gopsutil/v3 v3.23.9 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/yusufpapurcu/wmi v1.2.3 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.9.0 // indirect
golang.org/x/exp v0.0.0-20230905200255-921286631fa9
golang.org/x/mod v0.12.0 // indirect
golang.org/x/net v0.20.0 // indirect
Expand All @@ -74,4 +73,5 @@ require (
golang.org/x/tools v0.13.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,12 +190,12 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s=
google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk=
google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk=
google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
Expand Down
14 changes: 7 additions & 7 deletions internal/converter/generated/mlmd_openapi_converter.gen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading