Standardising triton image name, adding startup functions

amun-ai · May 7, 2024 · 71450e2 · 71450e2
1 parent a6348bb
commit 71450e2
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 11 deletions.
diff --git a/charts/hypha/Chart.lock b/charts/hypha/Chart.lock
@@ -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"
diff --git a/charts/hypha/Chart.yaml b/charts/hypha/Chart.yaml
@@ -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
@@ -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"

diff --git a/charts/hypha/charts/tritoninferenceserver-1.1.1.tgz b/charts/hypha/charts/tritoninferenceserver-1.1.1.tgz
diff --git a/charts/hypha/charts/tritoninferenceserver-1.1.2.tgz b/charts/hypha/charts/tritoninferenceserver-1.1.2.tgz
diff --git a/charts/hypha/templates/deployment.yaml b/charts/hypha/templates/deployment.yaml
@@ -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
 

diff --git a/charts/hypha/values.yaml b/charts/hypha/values.yaml
@@ -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
@@ -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"
 

diff --git a/charts/tritoninferenceserver/Chart.yaml b/charts/tritoninferenceserver/Chart.yaml
@@ -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

diff --git a/charts/tritoninferenceserver/templates/deployment.yaml b/charts/tritoninferenceserver/templates/deployment.yaml
@@ -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:

diff --git a/charts/tritoninferenceserver/values.yaml b/charts/tritoninferenceserver/values.yaml
@@ -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