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

Bump MLServer image to 0.1.1 #2558

Merged
merged 4 commits into from
Nov 3, 2020
Merged

Bump MLServer image to 0.1.1 #2558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e04b110
Bump mlserver image
Oct 19, 2020
aad1ab6
Fix shape
Oct 19, 2020
ca49f7f
Move resources out
Oct 20, 2020
5495f4a
Fix 404 in tests
Oct 20, 2020
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
13 changes: 11 additions & 2 deletions helm-charts/seldon-core-operator/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ helm install seldon-core-operator seldonio/seldon-core-operator --namespace seld
| engine.logMessagesExternally | bool | `false` | |
| engine.port | int | `8000` | |
| engine.prometheus.path | string | `"/prometheus"` | |
| engine.resources.cpuLimit | string | `"500m"` | |
| engine.resources.cpuRequest | string | `"500m"` | |
| engine.resources.memoryLimit | string | `"512Mi"` | |
| engine.resources.memoryRequest | string | `"512Mi"` | |
| engine.serviceAccount.name | string | `"default"` | |
| engine.user | int | `8888` | |
| executor.enabled | bool | `true` | |
Expand All @@ -60,6 +64,10 @@ helm install seldon-core-operator seldonio/seldon-core-operator --namespace seld
| executor.port | int | `8000` | |
| executor.prometheus.path | string | `"/prometheus"` | |
| executor.requestLogger.defaultEndpoint | string | `"http://default-broker"` | |
| executor.resources.cpuLimit | string | `"500m"` | |
| executor.resources.cpuRequest | string | `"500m"` | |
| executor.resources.memoryLimit | string | `"512Mi"` | |
| executor.resources.memoryRequest | string | `"512Mi"` | |
| executor.serviceAccount.name | string | `"default"` | |
| executor.user | int | `8888` | |
| explainer.image | string | `"seldonio/alibiexplainer:1.3.0-dev"` | |
Expand All @@ -70,6 +78,7 @@ helm install seldon-core-operator seldonio/seldon-core-operator --namespace seld
| istio.enabled | bool | `false` | |
| istio.gateway | string | `"istio-system/seldon-gateway"` | |
| istio.tlsMode | string | `""` | |
| keda.enabled | bool | `false` | |
| kubeflow | bool | `false` | |
| manager.cpuLimit | string | `"500m"` | |
| manager.cpuRequest | string | `"100m"` | |
Expand All @@ -85,7 +94,7 @@ helm install seldon-core-operator seldonio/seldon-core-operator --namespace seld
| predictor_servers.MLFLOW_SERVER.rest.image | string | `"seldonio/mlflowserver_rest"` | |
| predictor_servers.SKLEARN_SERVER.grpc.defaultImageVersion | string | `"1.3.0-dev"` | |
| predictor_servers.SKLEARN_SERVER.grpc.image | string | `"seldonio/sklearnserver_grpc"` | |
| predictor_servers.SKLEARN_SERVER.protocols.kfserving.defaultImageVersion | string | `"0.1.0"` | |
| predictor_servers.SKLEARN_SERVER.protocols.kfserving.defaultImageVersion | string | `"0.1.1"` | |
| predictor_servers.SKLEARN_SERVER.protocols.kfserving.image | string | `"seldonio/mlserver"` | |
| predictor_servers.SKLEARN_SERVER.rest.defaultImageVersion | string | `"1.3.0-dev"` | |
| predictor_servers.SKLEARN_SERVER.rest.image | string | `"seldonio/sklearnserver_rest"` | |
Expand All @@ -101,7 +110,7 @@ helm install seldon-core-operator seldonio/seldon-core-operator --namespace seld
| predictor_servers.TRITON_SERVER.rest.image | string | `"nvcr.io/nvidia/tritonserver"` | |
| predictor_servers.XGBOOST_SERVER.grpc.defaultImageVersion | string | `"1.3.0-dev"` | |
| predictor_servers.XGBOOST_SERVER.grpc.image | string | `"seldonio/xgboostserver_grpc"` | |
| predictor_servers.XGBOOST_SERVER.protocols.kfserving.defaultImageVersion | string | `"0.1.0"` | |
| predictor_servers.XGBOOST_SERVER.protocols.kfserving.defaultImageVersion | string | `"0.1.1"` | |
| predictor_servers.XGBOOST_SERVER.protocols.kfserving.image | string | `"seldonio/mlserver"` | |
| predictor_servers.XGBOOST_SERVER.rest.defaultImageVersion | string | `"1.3.0-dev"` | |
| predictor_servers.XGBOOST_SERVER.rest.image | string | `"seldonio/xgboostserver_rest"` | |
Expand Down
4 changes: 2 additions & 2 deletions helm-charts/seldon-core-operator/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ predictor_servers:
image: seldonio/sklearnserver_rest
protocols:
kfserving:
defaultImageVersion: "0.1.0"
defaultImageVersion: "0.1.1"
image: seldonio/mlserver
TENSORFLOW_SERVER:
grpc:
Expand All @@ -137,7 +137,7 @@ predictor_servers:
image: seldonio/xgboostserver_rest
protocols:
kfserving:
defaultImageVersion: "0.1.0"
defaultImageVersion: "0.1.1"
image: seldonio/mlserver
TRITON_SERVER:
grpc:
Expand Down
0 testing/resources/iris-sklearn-v2.yaml → notebooks/resources/iris-sklearn-v2.yaml
View file
Open in desktop
File renamed without changes.
0 testing/resources/iris-xgboost-v2.yaml → notebooks/resources/iris-xgboost-v2.yaml
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions notebooks/server_examples.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
"metadata": {},
"outputs": [],
"source": [
"%%writefile ../testing/resources/iris-sklearn-v2.yaml\n",
"%%writefile ./resources/iris-sklearn-v2.yaml\n",
"apiVersion: machinelearning.seldon.io/v1\n",
"kind: SeldonDeployment\n",
"metadata:\n",
Expand Down Expand Up @@ -391,7 +391,7 @@
"metadata": {},
"outputs": [],
"source": [
"%%writefile ../testing/resources/iris-xgboost-v2.yaml\n",
"%%writefile ./resources/iris-xgboost-v2.yaml\n",
"apiVersion: machinelearning.seldon.io/v1\n",
"kind: SeldonDeployment\n",
"metadata:\n",
Expand Down
18 changes: 0 additions & 18 deletions testing/resources/iris-v2-inference-request.json
View file
Open in desktop

This file was deleted.

25 changes: 17 additions & 8 deletions testing/scripts/test_prepackaged_servers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
log_sdep_logs,
)
from e2e_utils import v2_protocol
from e2e_utils.models import deploy_model
from conftest import SELDON_E2E_TESTS_USE_EXECUTOR

skipif_engine = pytest.mark.skipif(
Expand Down Expand Up @@ -50,8 +51,13 @@ def test_sklearn(self, namespace):

@skipif_engine
def test_sklearn_v2(self, namespace):
spec = "../resources/iris-sklearn-v2.yaml"
retry_run(f"kubectl apply -f {spec} -n {namespace}")
deploy_model(
"sklearn",
namespace=namespace,
protocol="kfserving",
model_implementation="SKLEARN_SERVER",
model_uri="gs://seldon-models/sklearn/iris",
)
wait_for_status("sklearn", namespace)
wait_for_rollout("sklearn", namespace)
time.sleep(1)
Expand All @@ -64,15 +70,14 @@ def test_sklearn_v2(self, namespace):
"inputs": [
{
"name": "input-0",
"shape": [4],
"shape": [1, 4],
"datatype": "FP32",
"data": [[0.1, 0.2, 0.3, 0.4]],
}
],
},
)
assert r.status_code == 200
run(f"kubectl delete -f {spec} -n {namespace}", shell=True)

# Test prepackaged server for tfserving
def test_tfserving(self, namespace):
Expand Down Expand Up @@ -119,8 +124,13 @@ def test_xgboost(self, namespace):

@skipif_engine
def test_xgboost_v2(self, namespace):
spec = "../resources/iris-xgboost-v2.yaml"
retry_run(f"kubectl apply -f {spec} -n {namespace}")
deploy_model(
"xgboost",
namespace=namespace,
protocol="kfserving",
model_implementation="XGBOOST_SERVER",
model_uri="gs://seldon-models/xgboost/iris",
)
wait_for_status("xgboost", namespace)
wait_for_rollout("xgboost", namespace)
time.sleep(1)
Expand All @@ -133,15 +143,14 @@ def test_xgboost_v2(self, namespace):
"inputs": [
{
"name": "input-0",
"shape": [4],
"shape": [1, 4],
"datatype": "FP32",
"data": [[0.1, 0.2, 0.3, 0.4]],
}
],
},
)
assert r.status_code == 200
run(f"kubectl delete -f {spec} -n {namespace}", shell=True)

# Test prepackaged server for MLflow
@skipif_engine
Expand Down