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

feat(merlin): Add default tolerations and node selectors for Merlin batch jobs #402

Merged
merged 4 commits into from
Mar 6, 2024
Merged

feat(merlin): Add default tolerations and node selectors for Merlin batch jobs #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c268c99
Add default merlin batch job tolerations and node selectors
deadlycoconuts Feb 28, 2024
2246e6a
Bump up chart version
deadlycoconuts Feb 28, 2024
71db79a
Update readme file
deadlycoconuts Feb 28, 2024
e05916b
Update Merlin app version
deadlycoconuts Mar 6, 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
4 changes: 2 additions & 2 deletions charts/merlin/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
appVersion: v0.38.0-rc1
appVersion: v0.40.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.13
version: 0.13.14
9 changes: 7 additions & 2 deletions charts/merlin/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# merlin

---
![Version: 0.13.13](https://img.shields.io/badge/Version-0.13.13-informational?style=flat-square)
![AppVersion: v0.38.0-rc1](https://img.shields.io/badge/AppVersion-v0.38.0--rc1-informational?style=flat-square)
![Version: 0.13.14](https://img.shields.io/badge/Version-0.13.14-informational?style=flat-square)
![AppVersion: v0.40.0](https://img.shields.io/badge/AppVersion-v0.40.0-informational?style=flat-square)

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

Expand Down Expand Up @@ -74,6 +74,11 @@ 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"` | |
| config.BatchConfig.Tolerations[0].Value | string | `"true"` | |
| config.DbConfig.Database | string | `"merlin"` | |
| config.DbConfig.Host | string | `"localhost"` | |
| config.DbConfig.Password | string | `"merlin"` | |
Expand Down
8 changes: 8 additions & 0 deletions charts/merlin/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,14 @@ config:
UPIDocumentation: "https://github.com/caraml-dev/universal-prediction-interface/blob/main/docs/api_markdown/caraml/upi/v1/index.md"
CPUCost: # Unused
MemoryCost: # Unused
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
Loading