Skip to content

Commit

Permalink
Update merlin versions
Browse files Browse the repository at this point in the history
  • Loading branch information
deadlycoconuts committed Nov 18, 2024
1 parent 622285d commit b861816
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions charts/merlin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"` | |
Expand All @@ -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` | |
Expand Down
4 changes: 2 additions & 2 deletions charts/merlin/tests/merlin_config_secret_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions charts/merlin/tests/merlin_deployment_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions charts/merlin/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit b861816

Please sign in to comment.