Merge upstream branch 'kserve/release-0.12' into odh-release-v0.12

This prepares ODH to deliver an equivalent to upstream version 0.12.1. Signed-off-by: Edgar Hernández <23639005+israel-hdez@users.noreply.github.com>
opendatahub-io · May 3, 2024 · 4aef074 · 4aef074
2 parents 0e4f7ea + d94ca25
commit 4aef074
Show file tree

Hide file tree

Showing 51 changed files with 64,135 additions and 16,775 deletions.
diff --git a/.github/workflows/python-test.yml b/.github/workflows/python-test.yml
@@ -34,7 +34,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11"]
     steps:
       - name: Checkout source
         uses: actions/checkout@v2
@@ -90,6 +90,36 @@ jobs:
           source kserve/.venv/bin/activate
           pytest --cov=kserve ./kserve
 
+      # ----------------------------------------Kserve Pydantic V1 Unit Tests--------------------------------------------
+      - name: Setup kserve pydantic v1 directory
+        run: |
+          mkdir -p python/kserve-pydantic-v1
+          cp -r python/kserve/* python/kserve-pydantic-v1
+          cd python/kserve-pydantic-v1
+          # update the lock file without installing dependencies
+          poetry update "pydantic<2.0" --lock
+      - name: Load cached kserve pydantic v1 venv
+        id: cached-kserve-pydantic-v1-dependencies
+        uses: actions/cache@v3
+        with:
+          path: python/kserve-pydantic-v1/.venv
+          key: kserve-pydantic-v1-venv-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/kserve-pydantic-v1/poetry.lock') }}
+      # install kserve pydantic v1 dependencies if cache does not exist
+      - name: Install kserve pydantic v1 dependencies
+        if: steps.cached-kserve-pydantic-v1-dependencies.outputs.cache-hit != 'true'
+        run: |
+          cd python/kserve-pydantic-v1
+          make install_dependencies
+      - name: Install kserve pydantic v1
+        run: |
+          cd python/kserve-pydantic-v1
+          make dev_install
+      - name: Test kserve pydantic v1
+        run: |
+          cd python
+          source kserve-pydantic-v1/.venv/bin/activate
+          pytest --cov=kserve ./kserve-pydantic-v1
+
       # ----------------------------------------Sklearn Server Unit Tests------------------------------------------------
       # load cached sklearn venv if cache exists
       - name: Load cached sklearn venv

diff --git a/charts/kserve-crd/Chart.yaml b/charts/kserve-crd/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: kserve-crd
-version: v0.12.0
+version: v0.12.1
 description: Helm chart for deploying kserve crds 
 keywords:
   - kserve

diff --git a/charts/kserve-crd/README.md b/charts/kserve-crd/README.md
@@ -2,15 +2,13 @@
 
 Helm chart for deploying kserve crds
 
-![Version: v0.12.0-rc1](https://img.shields.io/badge/Version-v0.12.0--rc1-informational?style=flat-square)
+![Version: v0.12.1](https://img.shields.io/badge/Version-v0.12.1-informational?style=flat-square)
 
 ## Installing the Chart
 
 To install the chart, run the following:
 
 ```console
-$ helm install kserve-crd oci://ghcr.io/kserve/charts/kserve-crd --version v0.12.0-rc1
+$ helm install kserve-crd oci://ghcr.io/kserve/charts/kserve-crd --version v0.12.1
 ```
 
-----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.12.0](https://github.com/norwoodj/helm-docs/releases/v1.12.0)
diff --git a/charts/kserve-resources/Chart.yaml b/charts/kserve-resources/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: kserve 
-version: v0.12.0
+version: v0.12.1
 description: Helm chart for deploying kserve resources
 keywords:
   - kserve

diff --git a/charts/kserve-resources/README.md b/charts/kserve-resources/README.md
@@ -2,22 +2,22 @@
 
 Helm chart for deploying kserve resources
 
-![Version: v0.12.0-rc1](https://img.shields.io/badge/Version-v0.12.0--rc1-informational?style=flat-square)
+![Version: v0.12.1](https://img.shields.io/badge/Version-v0.12.1-informational?style=flat-square)
 
 ## Installing the Chart
 
 To install the chart, run the following:
 
 ```console
-$ helm install kserve oci://ghcr.io/kserve/charts/kserve --version v0.12.0-rc1
+$ helm install kserve oci://ghcr.io/kserve/charts/kserve --version v0.12.1
 ```
 
 ## Values
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | kserve.agent.image | string | `"kserve/agent"` |  |
-| kserve.agent.tag | string | `"v0.12.0-rc1"` |  |
+| kserve.agent.tag | string | `"v0.12.1"` |  |
 | kserve.controller.affinity | object | `{}` |  |
 | kserve.controller.deploymentMode | string | `"Serverless"` |  |
 | kserve.controller.gateway.disableIngressCreation | bool | `false` |  |
@@ -37,48 +37,50 @@ $ helm install kserve oci://ghcr.io/kserve/charts/kserve --version v0.12.0-rc1
 | kserve.controller.resources.limits.memory | string | `"300Mi"` |  |
 | kserve.controller.resources.requests.cpu | string | `"100m"` |  |
 | kserve.controller.resources.requests.memory | string | `"300Mi"` |  |
-| kserve.controller.tag | string | `"v0.12.0-rc1"` |  |
+| kserve.controller.tag | string | `"v0.12.1"` |  |
 | kserve.controller.tolerations | list | `[]` |  |
 | kserve.controller.topologySpreadConstraints | list | `[]` |  |
 | kserve.metricsaggregator.enableMetricAggregation | string | `"false"` |  |
 | kserve.metricsaggregator.enablePrometheusScraping | string | `"false"` |  |
 | kserve.modelmesh.config.modelmeshImage | string | `"kserve/modelmesh"` |  |
-| kserve.modelmesh.config.modelmeshImageTag | string | `"v0.11.1"` |  |
+| kserve.modelmesh.config.modelmeshImageTag | string | `"v0.11.2"` |  |
 | kserve.modelmesh.config.modelmeshRuntimeAdapterImage | string | `"kserve/modelmesh-runtime-adapter"` |  |
-| kserve.modelmesh.config.modelmeshRuntimeAdapterImageTag | string | `"v0.11.1"` |  |
+| kserve.modelmesh.config.modelmeshRuntimeAdapterImageTag | string | `"v0.11.2"` |  |
 | kserve.modelmesh.config.podsPerRuntime | int | `2` |  |
 | kserve.modelmesh.config.restProxyImage | string | `"kserve/rest-proxy"` |  |
-| kserve.modelmesh.config.restProxyImageTag | string | `"v0.11.1"` |  |
+| kserve.modelmesh.config.restProxyImageTag | string | `"v0.11.2"` |  |
 | kserve.modelmesh.controller.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution[0].podAffinityTerm.labelSelector.matchExpressions[0].key | string | `"control-plane"` |  |
 | kserve.modelmesh.controller.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution[0].podAffinityTerm.labelSelector.matchExpressions[0].operator | string | `"In"` |  |
 | kserve.modelmesh.controller.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution[0].podAffinityTerm.labelSelector.matchExpressions[0].values[0] | string | `"modelmesh-controller"` |  |
 | kserve.modelmesh.controller.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution[0].podAffinityTerm.topologyKey | string | `"topology.kubernetes.io/zone"` |  |
 | kserve.modelmesh.controller.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution[0].weight | int | `100` |  |
 | kserve.modelmesh.controller.image | string | `"kserve/modelmesh-controller"` |  |
 | kserve.modelmesh.controller.nodeSelector | object | `{}` |  |
-| kserve.modelmesh.controller.tag | string | `"v0.11.1"` |  |
+| kserve.modelmesh.controller.tag | string | `"v0.11.2"` |  |
 | kserve.modelmesh.controller.tolerations | list | `[]` |  |
 | kserve.modelmesh.controller.topologySpreadConstraints | list | `[]` |  |
 | kserve.modelmesh.enabled | bool | `true` |  |
-| kserve.modelmeshVersion | string | `"v0.11.1"` |  |
+| kserve.modelmeshVersion | string | `"v0.11.2"` |  |
 | kserve.router.image | string | `"kserve/router"` |  |
-| kserve.router.tag | string | `"v0.12.0-rc1"` |  |
-| kserve.servingruntime.alibi.defaultVersion | string | `"v0.12.0-rc1"` |  |
+| kserve.router.tag | string | `"v0.12.1"` |  |
+| kserve.servingruntime.alibi.defaultVersion | string | `"v0.12.1"` |  |
 | kserve.servingruntime.alibi.image | string | `"kserve/alibi-explainer"` |  |
-| kserve.servingruntime.art.defaultVersion | string | `"v0.12.0-rc1"` |  |
+| kserve.servingruntime.art.defaultVersion | string | `"v0.12.1"` |  |
 | kserve.servingruntime.art.image | string | `"kserve/art-explainer"` |  |
+| kserve.servingruntime.huggingfaceserver.image | string | `"kserve/huggingfaceserver"` |  |
+| kserve.servingruntime.huggingfaceserver.tag | string | `"v0.12.1"` |  |
 | kserve.servingruntime.lgbserver.image | string | `"kserve/lgbserver"` |  |
-| kserve.servingruntime.lgbserver.tag | string | `"v0.12.0-rc1"` |  |
+| kserve.servingruntime.lgbserver.tag | string | `"v0.12.1"` |  |
 | kserve.servingruntime.mlserver.image | string | `"docker.io/seldonio/mlserver"` |  |
 | kserve.servingruntime.mlserver.modelClassPlaceholder | string | `"{{.Labels.modelClass}}"` |  |
 | kserve.servingruntime.mlserver.tag | string | `"1.3.2"` |  |
 | kserve.servingruntime.modelNamePlaceholder | string | `"{{.Name}}"` |  |
 | kserve.servingruntime.paddleserver.image | string | `"kserve/paddleserver"` |  |
-| kserve.servingruntime.paddleserver.tag | string | `"v0.12.0-rc1"` |  |
+| kserve.servingruntime.paddleserver.tag | string | `"v0.12.1"` |  |
 | kserve.servingruntime.pmmlserver.image | string | `"kserve/pmmlserver"` |  |
-| kserve.servingruntime.pmmlserver.tag | string | `"v0.12.0-rc1"` |  |
+| kserve.servingruntime.pmmlserver.tag | string | `"v0.12.1"` |  |
 | kserve.servingruntime.sklearnserver.image | string | `"kserve/sklearnserver"` |  |
-| kserve.servingruntime.sklearnserver.tag | string | `"v0.12.0-rc1"` |  |
+| kserve.servingruntime.sklearnserver.tag | string | `"v0.12.1"` |  |
 | kserve.servingruntime.tensorflow.image | string | `"tensorflow/serving"` |  |
 | kserve.servingruntime.tensorflow.tag | string | `"2.6.2"` |  |
 | kserve.servingruntime.torchserve.image | string | `"pytorch/torchserve-kfs"` |  |
@@ -87,7 +89,7 @@ $ helm install kserve oci://ghcr.io/kserve/charts/kserve --version v0.12.0-rc1
 | kserve.servingruntime.tritonserver.image | string | `"nvcr.io/nvidia/tritonserver"` |  |
 | kserve.servingruntime.tritonserver.tag | string | `"23.05-py3"` |  |
 | kserve.servingruntime.xgbserver.image | string | `"kserve/xgbserver"` |  |
-| kserve.servingruntime.xgbserver.tag | string | `"v0.12.0-rc1"` |  |
+| kserve.servingruntime.xgbserver.tag | string | `"v0.12.1"` |  |
 | kserve.storage.caBundleConfigMapName | string | `""` |  |
 | kserve.storage.caBundleVolumeMountPath | string | `"/etc/ssl/custom-certs"` |  |
 | kserve.storage.cpuModelcar | string | `"10m"` |  |
@@ -105,8 +107,6 @@ $ helm install kserve oci://ghcr.io/kserve/charts/kserve --version v0.12.0-rc1
 | kserve.storage.s3.verifySSL | string | `""` |  |
 | kserve.storage.storageSecretNameAnnotation | string | `"serving.kserve.io/secretName"` |  |
 | kserve.storage.storageSpecSecretName | string | `"storage-config"` |  |
-| kserve.storage.tag | string | `"v0.12.0-rc1"` |  |
-| kserve.version | string | `"v0.12.0-rc1"` |  |
+| kserve.storage.tag | string | `"v0.12.1"` |  |
+| kserve.version | string | `"v0.12.1"` |  |
 
-----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.12.0](https://github.com/norwoodj/helm-docs/releases/v1.12.0)
diff --git a/charts/kserve-resources/values.yaml b/charts/kserve-resources/values.yaml
@@ -1,5 +1,5 @@
 kserve:
-  version: &defaultVersion v0.12.0
+  version: &defaultVersion v0.12.1
   modelmeshVersion: &defaultModelMeshVersion v0.11.2
   agent:
     image: kserve/agent

diff --git a/hack/generate-install.sh b/hack/generate-install.sh
@@ -53,6 +53,7 @@ RELEASES=(
     "v0.12.0-rc0"
     "v0.12.0-rc1"
     "v0.12.0"
+    "v0.12.1"
 )
 
 TAG=$1

diff --git a/hack/quick_install.sh b/hack/quick_install.sh
@@ -34,7 +34,7 @@ export ISTIO_VERSION=1.19.4
 export ISTIO_DIR=istio-${ISTIO_VERSION}
 export KNATIVE_SERVING_VERSION=knative-v1.10.1
 export KNATIVE_ISTIO_VERSION=knative-v1.10.0
-export KSERVE_VERSION=v0.12.0
+export KSERVE_VERSION=v0.12.1
 export CERT_MANAGER_VERSION=v1.3.0
 export SCRIPT_DIR="$( dirname -- "${BASH_SOURCE[0]}" )"