Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(merlin): Fix merlin batch job node selector default value #408

Merged
merged 2 commits into from
Mar 20, 2024
Merged

chore(merlin): Fix merlin batch job node selector default value #408

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c86828
Fix merlin batch job node selector default value
Mar 20, 2024
91f5746
Fix lint
Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/merlin/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ maintainers:
- email: [email protected]
name: caraml-dev
name: merlin
version: 0.13.15
version: 0.13.16
5 changes: 2 additions & 3 deletions charts/merlin/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# merlin

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

Kubernetes-friendly ML model management, deployment, and serving.
Expand Down Expand Up @@ -74,7 +74,6 @@ The following table lists the configurable parameters of the Merlin chart and th
| config.AuthorizationConfig.Caching.KeyExpirySeconds | int | `600` | Cache key expiry duration |
| config.AuthorizationConfig.KetoRemoteRead | string | `"http://mlp-keto-read:80"` | |
| config.AuthorizationConfig.KetoRemoteWrite | string | `"http://mlp-keto-write:80"` | |
| config.BatchConfig.NodeSelectors.node-workload-type | string | `"batch"` | |
| config.BatchConfig.Tolerations[0].Effect | string | `"NoSchedule"` | |
| config.BatchConfig.Tolerations[0].Key | string | `"batch-job"` | |
| config.BatchConfig.Tolerations[0].Operator | string | `"Equal"` | |
Expand Down Expand Up @@ -237,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/merlin-spark-app/main.py"` | |
| imageBuilder.builderConfig.PredictionJobBaseImage.MainAppPath | string | `"/home/spark/main.py"` | |
| imageBuilder.builderConfig.Retention | string | `"48h"` | |
| imageBuilder.builderConfig.SafeToEvict | bool | `false` | |
| imageBuilder.builderConfig.Tolerations | list | `[]` | |
Expand Down
18 changes: 11 additions & 7 deletions charts/merlin/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,18 +153,16 @@
MaxAllowedReplica: 20
MerlinURL: /api/merlin/v1
MlpURL: /api
OauthClientID: # to be set via CICD pipeline
OauthClientID: # to be set via CICD pipeline

Check failure on line 156 in charts/merlin/values.yaml

View workflow job for this annotation

GitHub Actions / lint 

156:20 [comments] too few spaces before comment
UPIDocumentation: "https://github.com/caraml-dev/universal-prediction-interface/blob/main/docs/api_markdown/caraml/upi/v1/index.md"
CPUCost: # Unused
MemoryCost: # Unused
CPUCost: # Unused

Check failure on line 158 in charts/merlin/values.yaml

View workflow job for this annotation

GitHub Actions / lint 

158:14 [comments] too few spaces before comment
MemoryCost: # Unused

Check failure on line 159 in charts/merlin/values.yaml

View workflow job for this annotation

GitHub Actions / lint 

159:17 [comments] too few spaces before comment
BatchConfig:
Tolerations:
- Effect: NoSchedule
Key: batch-job
Operator: Equal
Value: "true"
NodeSelectors:
node-workload-type: "batch"
StandardTransformerConfig:
ImageName: ghcr.io/caraml-dev/merlin-transformer:1.0.0
SimulationFeast:
Expand Down Expand Up @@ -279,7 +277,7 @@
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/merlin-spark-app/main.py"
MainAppPath: "/home/spark/main.py"
BuildNamespace: "mlp"
DockerRegistry: "dockerRegistry"
BuildTimeout: "30m"
Expand Down Expand Up @@ -351,7 +349,13 @@
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
Loading