diff --git a/executor/go.mod b/executor/go.mod index 2c2727bdfb..a2af29cfa8 100644 --- a/executor/go.mod +++ b/executor/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/cloudevents/sdk-go v1.2.0 - github.com/confluentinc/confluent-kafka-go v1.4.2 + github.com/confluentinc/confluent-kafka-go v1.8.2 github.com/ghodss/yaml v1.0.0 github.com/go-logr/logr v0.4.0 github.com/golang/protobuf v1.5.2 diff --git a/executor/go.sum b/executor/go.sum index 0c8dbdd84d..e79b5377cb 100644 --- a/executor/go.sum +++ b/executor/go.sum @@ -317,6 +317,8 @@ github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnht github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/confluentinc/confluent-kafka-go v1.4.2 h1:13EK9RTujF7lVkvHQ5Hbu6bM+Yfrq8L0MkJNnjHSd4Q= github.com/confluentinc/confluent-kafka-go v1.4.2/go.mod h1:u2zNLny2xq+5rWeTQjFHbDzzNuba4P1vo31r9r4uAdg= +github.com/confluentinc/confluent-kafka-go v1.8.2 h1:PBdbvYpyOdFLehj8j+9ba7FL4c4Moxn79gy9cYKxG5E= +github.com/confluentinc/confluent-kafka-go v1.8.2/go.mod h1:u2zNLny2xq+5rWeTQjFHbDzzNuba4P1vo31r9r4uAdg= github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod h1:OApqhQ4XNSNC13gXIwDjhOQxjWa/NxkwZXJ1EvqT0ko= github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw= github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= diff --git a/notebooks/resources/elasticnet_wine_v2.yaml b/notebooks/resources/elasticnet_wine_v2.yaml new file mode 100644 index 0000000000..0dda137a5c --- /dev/null +++ b/notebooks/resources/elasticnet_wine_v2.yaml @@ -0,0 +1,15 @@ +apiVersion: machinelearning.seldon.io/v1alpha2 +kind: SeldonDeployment +metadata: + name: mlflow +spec: + protocol: kfserving # Activate v2 protocol + name: wines + predictors: + - graph: + children: [] + implementation: MLFLOW_SERVER + modelUri: gs://seldon-models/v1.12.0-dev/mlflow/elasticnet_wine + name: classifier + name: default + replicas: 1 diff --git a/notebooks/server_examples.ipynb b/notebooks/server_examples.ipynb index a6c984ef6e..838be3e89e 100644 --- a/notebooks/server_examples.ipynb +++ b/notebooks/server_examples.ipynb @@ -1007,7 +1007,7 @@ " - graph:\n", " children: []\n", " implementation: MLFLOW_SERVER\n", - " modelUri: gs://seldon-models/v1.10.0-dev/mlflow/elasticnet_wine\n", + " modelUri: gs://seldon-models/v1.12.0-dev/mlflow/elasticnet_wine\n", " name: classifier\n", " name: default\n", " replicas: 1" @@ -1164,7 +1164,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.8.10" + "version": "3.8.12" }, "varInspector": { "cols": { diff --git a/servers/mlflowserver/mlflowserver/requirements.txt b/servers/mlflowserver/mlflowserver/requirements.txt index 547fca5838..3bc87ccaac 100644 --- a/servers/mlflowserver/mlflowserver/requirements.txt +++ b/servers/mlflowserver/mlflowserver/requirements.txt @@ -1,7 +1,8 @@ -pyyaml==5.4.0 -requests<2.25.0 -mlflow<1.12.0 -pandas<1.2.0 +# Addresses CVE SNYK-PYTHON-PYYAML-590151 +PyYAML >= 5.4, < 5.5 +requests < 2.28.0 +mlflow < 1.24.0 +pandas < 1.2.0 # local seldon-core inside the s2i image /microservice/python diff --git a/testing/scripts/kind_test_all.sh b/testing/scripts/kind_test_all.sh index 058e093996..3c1005ee29 100755 --- a/testing/scripts/kind_test_all.sh +++ b/testing/scripts/kind_test_all.sh @@ -120,7 +120,7 @@ if [[ ${KIND_EXIT_VALUE} -eq 0 ]]; then echo "Files changed in prepackaged, python, or wrapper folder:" git --no-pager diff --exit-code --name-only origin/master ../../servers ../../integrations PREPACKAGED_MODIFIED=$? - if [[ $PREPACKAGED_MODIFIED -gt 0 ]] && [[ $PYTHON_MODIFIED -gt 0 ]]; then + if [[ $PREPACKAGED_MODIFIED -gt 0 ]] || [[ $PYTHON_MODIFIED -gt 0 ]]; then make kind_build_prepackaged PREPACKAGED_EXIT_VALUE=$? if [[ $PREPACKAGED_EXIT_VALUE -gt 0 ]]; then