Skip to content

Commit

Permalink
Standardising triton image name, adding startup functions
Browse files Browse the repository at this point in the history
  • Loading branch information
ctr26 committed Jun 18, 2024
1 parent 9759e58 commit d3cf650
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 11 deletions.
6 changes: 3 additions & 3 deletions charts/hypha/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ dependencies:
version: 13.4.3
- name: tritoninferenceserver
repository: file://../tritoninferenceserver
version: 1.1.1
version: 1.1.2
- name: redis
repository: https://charts.bitnami.com/bitnami
version: 17.11.6
digest: sha256:2e2b08803dce37c0b2563b94ad98eb20b1a97050a432d4e14fc31d118d4b00bc
generated: "2024-02-28T09:44:45.271230152Z"
digest: sha256:89ee5619cd218f473f1bd6326787e5964b28d1c5d520af3329e6dee2ee691e70
generated: "2024-05-07T09:07:40.632273684+01:00"
6 changes: 3 additions & 3 deletions charts/hypha/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.17.1
version: 0.17.3
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: 0.15.35
appVersion: 0.15.50
dependencies:
- name: minio
version: 13.4.3
Expand All @@ -30,7 +30,7 @@ dependencies:
# condition: tritoninferenceserver.enabled
- name: tritoninferenceserver
repository: "file://../tritoninferenceserver"
version: 1.1.1
version: 1.1.2
condition: tritoninferenceserver.enabled
- name: redis
repository: "https://charts.bitnami.com/bitnami"
Expand Down
Binary file removed charts/hypha/charts/tritoninferenceserver-1.1.1.tgz
Binary file not shown.
Binary file not shown.
4 changes: 3 additions & 1 deletion charts/hypha/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,9 @@ spec:
--enable-server-apps \
--apps-dir={{ .Values.appsDir }} \
--public-base-url={{ .Values.hyphaHostName }} \
{{- if .Values.startup_functions_URI }}
--startup-functions={{ .Values.startup_functions_URI }} \
{{- end }}
# TODO add option for non minio s3

Expand Down
4 changes: 3 additions & 1 deletion charts/hypha/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ jwt_secret: "xZ/aDcP+PfoTWgwA9ZADTtU/+djwMeMKz4QlSKRcgEs="
nodeSelector: {}
podLabels: {}

startupFunctionsURI: {}

# TODO add when https://github.com/amun-ai/hypha/pull/588
# securityContext:
# enabled: true
Expand All @@ -37,7 +39,7 @@ executablePath: /home/bin
image:
repository: ghcr.io/amun-ai/hypha
pullPolicy: IfNotPresent
tag: "0.15.35"
tag: "0.15.50"

triton_url: "http://tritoninferenceserver"

Expand Down
2 changes: 1 addition & 1 deletion charts/tritoninferenceserver/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 1.1.1
version: 1.1.2

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
2 changes: 1 addition & 1 deletion charts/tritoninferenceserver/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
{{ toYaml .Values.initContainers | nindent 8 }}
containers:
- name: tritoninferenceserver
image: {{ .Values.image.imageName }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
volumeMounts:
{{- toYaml .Values.volumeMounts | nindent 10 }}
env:
Expand Down
3 changes: 2 additions & 1 deletion charts/tritoninferenceserver/values.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
replicaCount: 1
image:
imageName: nvcr.io/nvidia/tritonserver:23.08-py3
repository: nvcr.io/nvidia/tritonserver
tag: 24.04-py3
pullPolicy: IfNotPresent
# modelRepositoryPath: s3://imjoy-s3.pasteur.fr:80/model-repository
modelSnapshots: /model-snapshots
Expand Down

0 comments on commit d3cf650

Please sign in to comment.