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|turing): Use configured image registry to generate default image names #394

Merged
merged 2 commits into from
Dec 14, 2023
Merged

chore(merlin|turing): Use configured image registry to generate default image names #394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db20ef1
Use configured image registry to generate default image names by rend…
Dec 14, 2023
ded046a
Fix router image version
Dec 14, 2023
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.11
version: 0.13.12
2 changes: 1 addition & 1 deletion 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.11](https://img.shields.io/badge/Version-0.13.11-informational?style=flat-square)
![Version: 0.13.12](https://img.shields.io/badge/Version-0.13.12-informational?style=flat-square)
![AppVersion: v0.38.0-rc1](https://img.shields.io/badge/AppVersion-v0.38.0--rc1-informational?style=flat-square)

Kubernetes-friendly ML model management, deployment, and serving.
Expand Down
6 changes: 3 additions & 3 deletions charts/merlin/templates/_config.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@
# just as if we were outside of include/define:
ImageBuilderConfig:
BaseImage:
ImageName: ghcr.io/caraml-dev/merlin/merlin-pyfunc-base:{{ printf "%s" $tag }}
ImageName: {{ .Values.deployment.image.registry }}/caraml-dev/merlin/merlin-pyfunc-base:{{ printf "%s" $tag }}
DockerfilePath: "pyfunc-server/docker/Dockerfile"
BuildContextURI: "git://github.com/caraml-dev/merlin.git#{{ printf "%s" $reference }}"
BuildContextSubPath: "python"
PredictionJobBaseImage:
ImageName: ghcr.io/caraml-dev/merlin/merlin-pyspark-base:{{ printf "%s" $tag }}
ImageName: {{ .Values.deployment.image.registry }}/caraml-dev/merlin/merlin-pyspark-base:{{ printf "%s" $tag }}
DockerfilePath: "batch-predictor/docker/app.Dockerfile"
BuildContextURI: "git://github.com/caraml-dev/merlin.git#{{ printf "%s" $reference }}"
BuildContextSubPath: "python"
MainAppPath: "/home/spark/merlin-spark-app/main.py"
StandardTransformerConfig:
ImageName: ghcr.io/caraml-dev/merlin-transformer:{{ printf "%s" $tag }}
ImageName: {{ .Values.deployment.image.registry }}/caraml-dev/merlin-transformer:{{ printf "%s" $tag }}
{{- end -}}
{{- end -}}
{{- end -}}
4 changes: 2 additions & 2 deletions charts/merlin/tests/merlin_config_secret_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ tests:
overrides:
ImageBuilderConfig:
BaseImage:
ImageName: ghcr.io/caraml-dev/merlin/merlin-pyfunc-base:0.0.0-some-other-value
ImageName: docker.io/caraml-dev/merlin/merlin-pyfunc-base:0.0.0-some-other-value
DockerfilePath: "python/pyfunc-server/docker/Dockerfile"
BuildContextURI: "git://github.com/caraml-dev/merlin.git#refs/pull/465"
asserts:
Expand All @@ -164,7 +164,7 @@ tests:
pattern: my-release-merlin-config$
- matchRegex:
path: stringData.[config.yaml]
pattern: "ImageName: ghcr.io/caraml-dev/merlin/merlin-pyfunc-base:0.0.0-some-other-value"
pattern: "ImageName: docker.io/caraml-dev/merlin/merlin-pyfunc-base:0.0.0-some-other-value"
- matchRegex:
path: stringData.[config.yaml]
pattern: "ImageName: ghcr.io/caraml-dev/merlin/merlin-pyspark-base:1.0.0-test-release"
Expand Down
2 changes: 1 addition & 1 deletion charts/turing/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ maintainers:
- email: [email protected]
name: caraml-dev
name: turing
version: 0.3.12
version: 0.3.13
2 changes: 1 addition & 1 deletion charts/turing/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# turing

---
![Version: 0.3.12](https://img.shields.io/badge/Version-0.3.12-informational?style=flat-square)
![Version: 0.3.13](https://img.shields.io/badge/Version-0.3.13-informational?style=flat-square)
![AppVersion: v1.16.0](https://img.shields.io/badge/AppVersion-v1.16.0-informational?style=flat-square)

Kubernetes-friendly multi-model orchestration and experimentation system.
Expand Down
6 changes: 3 additions & 3 deletions charts/turing/templates/_config.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
{{- $tag := $rendered.releasedVersion}}
{{- $ensemblerTag := default $tag $rendered.ensemblerTag }}
{{- $ensemblerServiceTag := default $ensemblerTag $rendered.ensemblerServiceTag }}
{{- $ensemblerJobPrefix := "ghcr.io/caraml-dev/turing/pyfunc-ensembler-job-py" -}}
{{- $servicePrefix := "ghcr.io/caraml-dev/turing/pyfunc-ensembler-service-py" -}}
{{- $ensemblerJobPrefix := printf "%s/caraml-dev/turing/pyfunc-ensembler-job-py" $.Values.deployment.image.registry -}}
{{- $servicePrefix := printf "%s/caraml-dev/turing/pyfunc-ensembler-service-py" $.Values.deployment.image.registry -}}
# Now we have access to the "real" root and current contexts
# just as if we were outside of include/define:
{{ with index . 1 }}
Expand All @@ -29,7 +29,7 @@ EnsemblerServiceBuilderConfig:
KanikoConfig: &kanikoConfig
BuildContextURI: {{ printf "%s/%s" "git://github.com/caraml-dev/turing.git#refs/tags" $tag }}
RouterDefaults:
Image: ghcr.io/caraml-dev/turing/turing-router:{{ printf "%s" $tag }}
Image: {{ .Values.deployment.image.registry }}/caraml-dev/turing/turing-router:{{ printf "%s" $tag }}
{{- end }}
{{- end }}
{{- end }}
4 changes: 2 additions & 2 deletions charts/turing/tests/turing_config_secret_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ tests:
BatchEnsemblingConfig:
ImageBuilderConfig:
BaseImages:
3.10.*: ghcr.io/caraml-dev/turing/pyfunc-ensembler-job-py3.10:test-tag-123
3.10.*: docker.io/caraml-dev/turing/pyfunc-ensembler-job-py3.10:test-tag-123
config:
BatchEnsemblingConfig:
Enabled: true
Expand Down Expand Up @@ -204,4 +204,4 @@ tests:
pattern: "3.9\\.\\*: ghcr.io/caraml-dev/turing/pyfunc-ensembler-job-py3.9:some-ensembler-tag"
- matchRegex:
path: stringData.[config.yaml]
pattern: "3.10\\.\\*: ghcr.io/caraml-dev/turing/pyfunc-ensembler-job-py3.10:test-tag-123"
pattern: "3.10\\.\\*: docker.io/caraml-dev/turing/pyfunc-ensembler-job-py3.10:test-tag-123"