From 862ae2d664404a7e9254e6d2f59f30056bfcadce Mon Sep 17 00:00:00 2001 From: Rafael Vasquez Date: Tue, 3 Oct 2023 10:17:52 -0400 Subject: [PATCH 1/6] Update image tags for release-0.11.1 Signed-off-by: Rafael Vasquez --- .github/workflows/fvt.yml | 10 +++++----- config/default/config-defaults.yaml | 6 +++--- config/dependencies/quickstart.yaml | 2 +- config/manager/kustomization.yaml | 2 +- controllers/modelmesh/modelmesh.go | 8 ++++---- docs/component-versions.md | 8 ++++---- docs/install/install-script.md | 8 ++++---- docs/quickstart.md | 6 +++--- scripts/setup_user_namespaces.sh | 2 +- 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/fvt.yml b/.github/workflows/fvt.yml index f7bb5535..55db527b 100644 --- a/.github/workflows/fvt.yml +++ b/.github/workflows/fvt.yml @@ -113,11 +113,11 @@ jobs: docker pull seldonio/mlserver:1.3.2 docker pull openvino/model_server:2022.2 # docker pull pytorch/torchserve:0.7.1-cpu - docker pull kserve/modelmesh:latest - docker pull kserve/modelmesh-minio-dev-examples:latest - docker pull kserve/modelmesh-minio-examples:latest - docker pull kserve/modelmesh-runtime-adapter:latest - docker pull kserve/rest-proxy:latest + docker pull kserve/modelmesh:v0.11.1 + docker pull kserve/modelmesh-minio-dev-examples:v0.11.1 + docker pull kserve/modelmesh-minio-examples:v0.11.1 + docker pull kserve/modelmesh-runtime-adapter:v0.11.1 + docker pull kserve/rest-proxy:v0.11.1 - name: Check installation run: | diff --git a/config/default/config-defaults.yaml b/config/default/config-defaults.yaml index 4a4c7e42..4efbba8d 100644 --- a/config/default/config-defaults.yaml +++ b/config/default/config-defaults.yaml @@ -16,7 +16,7 @@ podsPerRuntime: 2 headlessService: true modelMeshImage: name: kserve/modelmesh - tag: latest + tag: v0.11.1 modelMeshResources: requests: cpu: "300m" @@ -29,7 +29,7 @@ restProxy: port: 8008 image: name: kserve/rest-proxy - tag: latest + tag: v0.11.1 resources: requests: cpu: "50m" @@ -39,7 +39,7 @@ restProxy: memory: "512Mi" storageHelperImage: name: kserve/modelmesh-runtime-adapter - tag: latest + tag: v0.11.1 command: ["/opt/app/puller"] storageHelperResources: requests: diff --git a/config/dependencies/quickstart.yaml b/config/dependencies/quickstart.yaml index e04bfeae..53aa8921 100644 --- a/config/dependencies/quickstart.yaml +++ b/config/dependencies/quickstart.yaml @@ -110,7 +110,7 @@ spec: - name: MINIO_SECRET_KEY value: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY # image: quay.io/cloudservices/minio:latest - image: kserve/modelmesh-minio-examples:latest + image: kserve/modelmesh-minio-examples:v0.11.1 name: minio --- apiVersion: v1 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 55e768ba..a89e16d8 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -18,4 +18,4 @@ images: - name: modelmesh-controller newName: kserve/modelmesh-controller ## NOTE THIS SHOULD BE REPLACED WITH LATEST CONTROLLER IMAGE TAG - newTag: latest + newTag: v0.11.1 diff --git a/controllers/modelmesh/modelmesh.go b/controllers/modelmesh/modelmesh.go index 2a8dd1b2..0e4f25b7 100644 --- a/controllers/modelmesh/modelmesh.go +++ b/controllers/modelmesh/modelmesh.go @@ -261,24 +261,24 @@ func (m *Deployment) addMMEnvVars(deployment *appsv1.Deployment) error { } if m.EnableAccessLogging { - // See https://github.com/kserve/modelmesh/blob/v0.11.0/src/main/java/com/ibm/watson/modelmesh/ModelMeshEnvVars.java#L55 + // See https://github.com/kserve/modelmesh/blob/v0.11.1/src/main/java/com/ibm/watson/modelmesh/ModelMeshEnvVars.java#L55 if err := setEnvironmentVar(ModelMeshContainerName, "MM_LOG_EACH_INVOKE", "true", deployment); err != nil { return err } } if m.GrpcMaxMessageSize > 0 { - // See https://github.com/kserve/modelmesh/blob/v0.11.0/src/main/java/com/ibm/watson/modelmesh/ModelMeshEnvVars.java#L38 + // See https://github.com/kserve/modelmesh/blob/v0.11.1/src/main/java/com/ibm/watson/modelmesh/ModelMeshEnvVars.java#L38 if err := setEnvironmentVar(ModelMeshContainerName, "MM_SVC_GRPC_MAX_MSG_SIZE", strconv.Itoa(m.GrpcMaxMessageSize), deployment); err != nil { return err } } - // See https://github.com/kserve/modelmesh/blob/v0.11.0/src/main/java/com/ibm/watson/modelmesh/ModelMeshEnvVars.java#L31 + // See https://github.com/kserve/modelmesh/blob/v0.11.1/src/main/java/com/ibm/watson/modelmesh/ModelMeshEnvVars.java#L31 if err := setEnvironmentVar(ModelMeshContainerName, "MM_KVSTORE_PREFIX", ModelMeshEtcdPrefix, deployment); err != nil { return err } - // See https://github.com/kserve/modelmesh/blob/v0.11.0/src/main/java/com/ibm/watson/modelmesh/ModelMeshEnvVars.java#L68 + // See https://github.com/kserve/modelmesh/blob/v0.11.1/src/main/java/com/ibm/watson/modelmesh/ModelMeshEnvVars.java#L68 if err := setEnvironmentVar(ModelMeshContainerName, "MM_DEFAULT_VMODEL_OWNER", m.DefaultVModelOwner, deployment); err != nil { return err } diff --git a/docs/component-versions.md b/docs/component-versions.md index 890a2c53..fa590b52 100644 --- a/docs/component-versions.md +++ b/docs/component-versions.md @@ -1,8 +1,8 @@ # Component versions -The following table shows the component versions for the latest modelmesh-serving release (v0.11.0). +The following table shows the component versions for the latest modelmesh-serving release (v0.11.1). | Component | Description | Upstream Revision | | - | - | - | -| ModelMesh | Serves as a general-purpose model serving management/routing layer | [v0.11.0](https://github.com/kserve/modelmesh/tree/v0.11.0) | -| ModelMesh Runtime Adapter | Contains the unified puller/runtime-adapter image | [v0.11.0](https://github.com/kserve/modelmesh-runtime-adapter/tree/v0.11.0) | -| REST Proxy | Supports inference requests using KServe V2 REST Predict Protocol | [v0.11.0](https://github.com/kserve/rest-proxy/tree/v0.11.0) | +| ModelMesh | Serves as a general-purpose model serving management/routing layer | [v0.11.1](https://github.com/kserve/modelmesh/tree/v0.11.0) | +| ModelMesh Runtime Adapter | Contains the unified puller/runtime-adapter image | [v0.11.1](https://github.com/kserve/modelmesh-runtime-adapter/tree/v0.11.1) | +| REST Proxy | Supports inference requests using KServe V2 REST Predict Protocol | [v0.11.1](https://github.com/kserve/rest-proxy/tree/v0.11.1) | diff --git a/docs/install/install-script.md b/docs/install/install-script.md index 238b9274..ff24f2c7 100644 --- a/docs/install/install-script.md +++ b/docs/install/install-script.md @@ -42,15 +42,15 @@ A secret named `model-serving-etcd` will be created and passed to the controller -To install the most recent _stable release_ of [modelmesh-serving](https://github.com/kserve/modelmesh-serving/releases/latest) -follow the [Installation instructions](https://github.com/kserve/modelmesh-serving/blob/release-0.11/docs/install/install-script.md) for version `v0.11.0`. +To install the most recent _stable release_ of [modelmesh-serving](https://github.com/kserve/modelmesh-serving/releases/v0.11.1) +follow the [Installation instructions](https://github.com/kserve/modelmesh-serving/blob/release-0.11.1/docs/install/install-script.md) for version `v0.11.1`. Start by cloning the [modelmesh-serving](https://github.com/kserve/modelmesh-serving.git) repository: - + ```shell -RELEASE="main" +RELEASE="release-0.11.1" git clone -b $RELEASE --depth 1 --single-branch https://github.com/kserve/modelmesh-serving.git cd modelmesh-serving ``` diff --git a/docs/quickstart.md b/docs/quickstart.md index 585e3b21..510ad29b 100644 --- a/docs/quickstart.md +++ b/docs/quickstart.md @@ -4,7 +4,7 @@ To quickly get started using ModelMesh Serving, here is a brief guide. -> **Note**: This document describes how to install the _latest unreleased_ version of ModelMesh for developers and early adopters. To install the most recent _stable release_, please follow the [Quick Start Guide for version 0.11](https://github.com/kserve/modelmesh-serving/blob/release-0.11/docs/quickstart.md). +> **Note**: This document describes how to install the _latest unreleased_ version of ModelMesh for developers and early adopters. To install the most recent _stable release_, please follow the [Quick Start Guide for version 0.11.1](https://github.com/kserve/modelmesh-serving/blob/release-0.11.1/docs/quickstart.md). ## Prerequisites @@ -16,10 +16,10 @@ To quickly get started using ModelMesh Serving, here is a brief guide. ### Clone the ModelMesh repository - + ```shell -RELEASE="main" +RELEASE="release-0.11.1" git clone -b $RELEASE --depth 1 --single-branch https://github.com/kserve/modelmesh-serving.git cd modelmesh-serving ``` diff --git a/scripts/setup_user_namespaces.sh b/scripts/setup_user_namespaces.sh index c3b663fb..608a44d3 100755 --- a/scripts/setup_user_namespaces.sh +++ b/scripts/setup_user_namespaces.sh @@ -31,7 +31,7 @@ EOF ctrl_ns="modelmesh-serving" user_ns_array=() -modelmesh_release="v0.11.0" # The latest release is the default +modelmesh_release="release-0.11.1" # The latest release is the default create_storage_secret=false deploy_serving_runtimes=false dev_mode=false # Set to true to use locally cloned files instead of from a release From 1757a258785a5a67d0dea637d793e6e656758d31 Mon Sep 17 00:00:00 2001 From: Rafael Vasquez Date: Tue, 3 Oct 2023 10:20:50 -0400 Subject: [PATCH 2/6] Fix user namesepace tag Signed-off-by: Rafael Vasquez --- scripts/setup_user_namespaces.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/setup_user_namespaces.sh b/scripts/setup_user_namespaces.sh index 608a44d3..67dcc67b 100755 --- a/scripts/setup_user_namespaces.sh +++ b/scripts/setup_user_namespaces.sh @@ -31,7 +31,7 @@ EOF ctrl_ns="modelmesh-serving" user_ns_array=() -modelmesh_release="release-0.11.1" # The latest release is the default +modelmesh_release="v0.11.1" # The latest release is the default create_storage_secret=false deploy_serving_runtimes=false dev_mode=false # Set to true to use locally cloned files instead of from a release From 864295496f2bf4ecc2361ad433dd3ed565875281 Mon Sep 17 00:00:00 2001 From: Christian Kadner Date: Tue, 3 Oct 2023 10:39:08 -0700 Subject: [PATCH 3/6] Update workflow branch pattern Signed-off-by: Christian Kadner --- .github/workflows/build.yml | 2 +- .github/workflows/fvt.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/test.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0ef40e62..6e8c2328 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ on: push: branches: - main - - 'release-[0-9].[0-9]+' + - 'release-[0-9].[0-9]+*' tags: - 'v*' paths-ignore: diff --git a/.github/workflows/fvt.yml b/.github/workflows/fvt.yml index 55db527b..83278934 100644 --- a/.github/workflows/fvt.yml +++ b/.github/workflows/fvt.yml @@ -5,7 +5,7 @@ on: pull_request: branches: - main - - 'release-[0-9].[0-9]+' + - 'release-[0-9].[0-9]+*' paths: - '**' - '!.github/**' diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d8e384a9..6652eb16 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -4,7 +4,7 @@ on: pull_request: branches: - main - - 'release-[0-9].[0-9]+' + - 'release-[0-9].[0-9]+*' paths-ignore: - '.github/**' - '.tekton/**' diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 54ee397b..40145831 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,7 +4,7 @@ on: pull_request: branches: - main - - 'release-[0-9].[0-9]+' + - 'release-[0-9].[0-9]+*' paths-ignore: - '.github/**' - '.tekton/**' From 9fa1d801b34c1a44f8968dbff6d92088035ef0b0 Mon Sep 17 00:00:00 2001 From: Rafael Vasquez Date: Tue, 3 Oct 2023 14:00:11 -0400 Subject: [PATCH 4/6] Update workflow branch pattern Signed-off-by: Rafael Vasquez --- .github/workflows/build.yml | 2 +- .github/workflows/fvt.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/test.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6e8c2328..fc658691 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ on: push: branches: - main - - 'release-[0-9].[0-9]+*' + - 'release-[0-9][.0-9]+' tags: - 'v*' paths-ignore: diff --git a/.github/workflows/fvt.yml b/.github/workflows/fvt.yml index 83278934..4dadc24c 100644 --- a/.github/workflows/fvt.yml +++ b/.github/workflows/fvt.yml @@ -5,7 +5,7 @@ on: pull_request: branches: - main - - 'release-[0-9].[0-9]+*' + - 'release-[0-9][.0-9]+' paths: - '**' - '!.github/**' diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 6652eb16..1a7b11a9 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -4,7 +4,7 @@ on: pull_request: branches: - main - - 'release-[0-9].[0-9]+*' + - 'release-[0-9][.0-9]+' paths-ignore: - '.github/**' - '.tekton/**' diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 40145831..2361aa3b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,7 +4,7 @@ on: pull_request: branches: - main - - 'release-[0-9].[0-9]+*' + - 'release-[0-9][.0-9]+' paths-ignore: - '.github/**' - '.tekton/**' From d73eb39f24c9f8bc7292acf596fe28bfd4b1e191 Mon Sep 17 00:00:00 2001 From: Rafael Vasquez Date: Tue, 3 Oct 2023 14:02:36 -0400 Subject: [PATCH 5/6] Specify release branch Signed-off-by: Rafael Vasquez --- .github/workflows/build.yml | 2 +- .github/workflows/fvt.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/test.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fc658691..4555fee6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ on: push: branches: - main - - 'release-[0-9][.0-9]+' + - 'release-0.11.1' tags: - 'v*' paths-ignore: diff --git a/.github/workflows/fvt.yml b/.github/workflows/fvt.yml index 4dadc24c..d94db800 100644 --- a/.github/workflows/fvt.yml +++ b/.github/workflows/fvt.yml @@ -5,7 +5,7 @@ on: pull_request: branches: - main - - 'release-[0-9][.0-9]+' + - 'release-0.11.1' paths: - '**' - '!.github/**' diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 1a7b11a9..8c44d4da 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -4,7 +4,7 @@ on: pull_request: branches: - main - - 'release-[0-9][.0-9]+' + - 'release-0.11.1' paths-ignore: - '.github/**' - '.tekton/**' diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2361aa3b..19472172 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,7 +4,7 @@ on: pull_request: branches: - main - - 'release-[0-9][.0-9]+' + - 'release-0.11.1' paths-ignore: - '.github/**' - '.tekton/**' From 215f94e6ed7f52adbf6dde77dc9569283ba8deee Mon Sep 17 00:00:00 2001 From: Rafael Vasquez Date: Tue, 3 Oct 2023 14:12:13 -0400 Subject: [PATCH 6/6] Update missed config version Signed-off-by: Rafael Vasquez --- docs/component-versions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/component-versions.md b/docs/component-versions.md index fa590b52..ea32ceb0 100644 --- a/docs/component-versions.md +++ b/docs/component-versions.md @@ -3,6 +3,6 @@ The following table shows the component versions for the latest modelmesh-serving release (v0.11.1). | Component | Description | Upstream Revision | | - | - | - | -| ModelMesh | Serves as a general-purpose model serving management/routing layer | [v0.11.1](https://github.com/kserve/modelmesh/tree/v0.11.0) | +| ModelMesh | Serves as a general-purpose model serving management/routing layer | [v0.11.1](https://github.com/kserve/modelmesh/tree/v0.11.1) | | ModelMesh Runtime Adapter | Contains the unified puller/runtime-adapter image | [v0.11.1](https://github.com/kserve/modelmesh-runtime-adapter/tree/v0.11.1) | | REST Proxy | Supports inference requests using KServe V2 REST Predict Protocol | [v0.11.1](https://github.com/kserve/rest-proxy/tree/v0.11.1) |