From b8618168e3ec692e7751ddde18b1d991b02454b6 Mon Sep 17 00:00:00 2001 From: ewezy Date: Mon, 18 Nov 2024 15:56:08 +0800 Subject: [PATCH] Update merlin versions --- charts/merlin/README.md | 8 ++++---- charts/merlin/tests/merlin_config_secret_test.yaml | 4 ++-- charts/merlin/tests/merlin_deployment_test.yaml | 4 ++-- charts/merlin/values.yaml | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/charts/merlin/README.md b/charts/merlin/README.md index 9c7bc5ed..096749ed 100644 --- a/charts/merlin/README.md +++ b/charts/merlin/README.md @@ -214,9 +214,9 @@ The following table lists the configurable parameters of the Merlin chart and th | global.protocol | string | `"http"` | | | imageBuilder.builderConfig.ArtifactServiceType | string | `"nop"` | | | imageBuilder.builderConfig.BaseImage.BuildContextSubPath | string | `"python"` | | -| imageBuilder.builderConfig.BaseImage.BuildContextURI | string | `"git://github.com/caraml-dev/merlin.git#refs/tags/v0.38.0-rc1"` | | +| imageBuilder.builderConfig.BaseImage.BuildContextURI | string | `"git://github.com/caraml-dev/merlin.git#refs/tags/v0.45.3"` | | | imageBuilder.builderConfig.BaseImage.DockerfilePath | string | `"pyfunc-server/docker/Dockerfile"` | | -| imageBuilder.builderConfig.BaseImage.ImageName | string | `"ghcr.io/caraml-dev/merlin/merlin-pyfunc-base:0.38.0-rc1"` | | +| imageBuilder.builderConfig.BaseImage.ImageName | string | `"ghcr.io/caraml-dev/merlin/merlin-pyfunc-base:0.45.3"` | | | imageBuilder.builderConfig.BuildNamespace | string | `"mlp"` | | | imageBuilder.builderConfig.BuildTimeout | string | `"30m"` | | | imageBuilder.builderConfig.DefaultResources.Limits.CPU | string | `"1"` | | @@ -234,9 +234,9 @@ The following table lists the configurable parameters of the Merlin chart and th | imageBuilder.builderConfig.MaximumRetry | int | `3` | | | imageBuilder.builderConfig.NodeSelectors | object | `{}` | | | imageBuilder.builderConfig.PredictionJobBaseImage.BuildContextSubPath | string | `"python"` | | -| imageBuilder.builderConfig.PredictionJobBaseImage.BuildContextURI | string | `"git://github.com/caraml-dev/merlin.git#refs/tags/v0.38.0-rc1"` | | +| imageBuilder.builderConfig.PredictionJobBaseImage.BuildContextURI | string | `"git://github.com/caraml-dev/merlin.git#refs/tags/v0.45.3"` | | | imageBuilder.builderConfig.PredictionJobBaseImage.DockerfilePath | string | `"batch-predictor/docker/app.Dockerfile"` | | -| imageBuilder.builderConfig.PredictionJobBaseImage.ImageName | string | `"ghcr.io/caraml-dev/merlin/merlin-pyspark-base:0.38.0-rc1"` | | +| imageBuilder.builderConfig.PredictionJobBaseImage.ImageName | string | `"ghcr.io/caraml-dev/merlin/merlin-pyspark-base:0.45.3"` | | | imageBuilder.builderConfig.PredictionJobBaseImage.MainAppPath | string | `"/home/spark/merlin-spark-app/main.py"` | | | imageBuilder.builderConfig.Retention | string | `"48h"` | | | imageBuilder.builderConfig.SafeToEvict | bool | `false` | | diff --git a/charts/merlin/tests/merlin_config_secret_test.yaml b/charts/merlin/tests/merlin_config_secret_test.yaml index c23f079d..af9c8fb8 100644 --- a/charts/merlin/tests/merlin_config_secret_test.yaml +++ b/charts/merlin/tests/merlin_config_secret_test.yaml @@ -195,7 +195,7 @@ tests: pattern: my-release-merlin-config$ - matchRegex: path: stringData.[config.yaml] - pattern: "ImageName: ghcr.io/caraml-dev/merlin/merlin-pyfunc-base:0.38.0-rc1" + pattern: "ImageName: ghcr.io/caraml-dev/merlin/merlin-pyfunc-base:0.45.3" - matchRegex: path: stringData.[config.yaml] - pattern: "BuildContextURI: git://github.com/caraml-dev/merlin.git#refs/tags/v0.38.0-rc1" + pattern: "BuildContextURI: git://github.com/caraml-dev/merlin.git#refs/tags/v0.45.3" diff --git a/charts/merlin/tests/merlin_deployment_test.yaml b/charts/merlin/tests/merlin_deployment_test.yaml index 4b283d58..6676beb7 100644 --- a/charts/merlin/tests/merlin_deployment_test.yaml +++ b/charts/merlin/tests/merlin_deployment_test.yaml @@ -177,7 +177,7 @@ tests: pattern: my-release-merlin$ - equal: # check image version path: spec.template.spec.containers[0].image - value: ghcr.io/caraml-dev/merlin:0.38.0-rc1 + value: ghcr.io/caraml-dev/merlin:0.45.3 - equal: # check version label path: spec.template.metadata.labels.version - value: 0.38.0-rc1 + value: 0.45.3 diff --git a/charts/merlin/values.yaml b/charts/merlin/values.yaml index 1396a008..a0715333 100644 --- a/charts/merlin/values.yaml +++ b/charts/merlin/values.yaml @@ -268,14 +268,14 @@ imageBuilder: builderConfig: ArtifactServiceType: nop BaseImage: - ImageName: ghcr.io/caraml-dev/merlin/merlin-pyfunc-base:0.38.0-rc1 + ImageName: ghcr.io/caraml-dev/merlin/merlin-pyfunc-base:0.45.3 DockerfilePath: "pyfunc-server/docker/Dockerfile" - BuildContextURI: "git://github.com/caraml-dev/merlin.git#refs/tags/v0.38.0-rc1" + BuildContextURI: "git://github.com/caraml-dev/merlin.git#refs/tags/v0.45.3" BuildContextSubPath: "python" PredictionJobBaseImage: - ImageName: ghcr.io/caraml-dev/merlin/merlin-pyspark-base:0.38.0-rc1 + ImageName: ghcr.io/caraml-dev/merlin/merlin-pyspark-base:0.45.3 DockerfilePath: "batch-predictor/docker/app.Dockerfile" - BuildContextURI: "git://github.com/caraml-dev/merlin.git#refs/tags/v0.38.0-rc1" + BuildContextURI: "git://github.com/caraml-dev/merlin.git#refs/tags/v0.45.3" BuildContextSubPath: "python" MainAppPath: "/home/spark/merlin-spark-app/main.py" BuildNamespace: "mlp"