Skip to content

Commit

Permalink
chore(merlin): Update path of batch-predictor's main.py (#414)
Browse files Browse the repository at this point in the history
  • Loading branch information
ariefrahmansyah authored May 6, 2024
1 parent f53d4a9 commit 1d1a827
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 8 deletions.
4 changes: 2 additions & 2 deletions charts/merlin/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
appVersion: v0.41.0
appVersion: v0.42.0
dependencies:
- alias: merlin-postgresql
condition: merlin-postgresql.enabled
Expand Down Expand Up @@ -33,4 +33,4 @@ maintainers:
- email: [email protected]
name: caraml-dev
name: merlin
version: 0.13.17
version: 0.13.18
6 changes: 3 additions & 3 deletions charts/merlin/README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# merlin

---
![Version: 0.13.17](https://img.shields.io/badge/Version-0.13.17-informational?style=flat-square)
![AppVersion: v0.41.0](https://img.shields.io/badge/AppVersion-v0.41.0-informational?style=flat-square)
![Version: 0.13.18](https://img.shields.io/badge/Version-0.13.18-informational?style=flat-square)
![AppVersion: v0.42.0](https://img.shields.io/badge/AppVersion-v0.42.0-informational?style=flat-square)

Kubernetes-friendly ML model management, deployment, and serving.

Expand Down Expand Up @@ -236,7 +236,7 @@ The following table lists the configurable parameters of the Merlin chart and th
| imageBuilder.builderConfig.PredictionJobBaseImage.BuildContextURI | string | `"git://github.com/caraml-dev/merlin.git#refs/tags/v0.38.0-rc1"` | |
| 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.MainAppPath | string | `"/home/spark/main.py"` | |
| imageBuilder.builderConfig.PredictionJobBaseImage.MainAppPath | string | `"/home/spark/merlin-spark-app/main.py"` | |
| imageBuilder.builderConfig.Retention | string | `"48h"` | |
| imageBuilder.builderConfig.SafeToEvict | bool | `false` | |
| imageBuilder.builderConfig.Tolerations | list | `[]` | |
Expand Down
2 changes: 1 addition & 1 deletion charts/merlin/templates/_config.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ ImageBuilderConfig:
DockerfilePath: "batch-predictor/docker/app.Dockerfile"
BuildContextURI: "git://github.com/caraml-dev/merlin.git#{{ printf "%s" $reference }}"
BuildContextSubPath: "python"
MainAppPath: "/home/spark/main.py"
MainAppPath: "/home/spark/merlin-spark-app/main.py"
StandardTransformerConfig:
ImageName: {{ .Values.deployment.image.registry }}/caraml-dev/merlin-transformer:{{ printf "%s" $tag }}
ObservabilityPublisher:
Expand Down
10 changes: 8 additions & 2 deletions charts/merlin/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ imageBuilder:
DockerfilePath: "batch-predictor/docker/app.Dockerfile"
BuildContextURI: "git://github.com/caraml-dev/merlin.git#refs/tags/v0.38.0-rc1"
BuildContextSubPath: "python"
MainAppPath: "/home/spark/main.py"
MainAppPath: "/home/spark/merlin-spark-app/main.py"
BuildNamespace: "mlp"
DockerRegistry: "dockerRegistry"
BuildTimeout: "30m"
Expand Down Expand Up @@ -349,7 +349,13 @@ ui:
upiDocURL: "https://github.com/caraml-dev/universal-prediction-interface/blob/main/docs/api_markdown/caraml/upi/v1/index.md"
mlp:
apiHost: /api
docsURL: [{"href": "https://github.com/gojek/merlin/blob/main/docs/getting-started/README.md", "label": "Getting Started with Merlin"}]
docsURL:
[
{
"href": "https://github.com/gojek/merlin/blob/main/docs/getting-started/README.md",
"label": "Getting Started with Merlin",
},
]
# -- Comma-separated value of Docker registries that can be chosen in deployment page
dockerRegistries: ghcr.io/gojek,ghcr.io/your-company
maxAllowedReplica: 20
Expand Down

0 comments on commit 1d1a827

Please sign in to comment.