From d3cf6508b286b6d3ba24003a04fda4d648d2fb6e Mon Sep 17 00:00:00 2001 From: Craig Russell Date: Tue, 7 May 2024 10:47:09 +0100 Subject: [PATCH] Standardising triton image name, adding startup functions --- charts/hypha/Chart.lock | 6 +++--- charts/hypha/Chart.yaml | 6 +++--- .../hypha/charts/tritoninferenceserver-1.1.1.tgz | Bin 3473 -> 0 bytes .../hypha/charts/tritoninferenceserver-1.1.2.tgz | Bin 0 -> 3486 bytes charts/hypha/templates/deployment.yaml | 4 +++- charts/hypha/values.yaml | 4 +++- charts/tritoninferenceserver/Chart.yaml | 2 +- .../templates/deployment.yaml | 2 +- charts/tritoninferenceserver/values.yaml | 3 ++- 9 files changed, 16 insertions(+), 11 deletions(-) delete mode 100644 charts/hypha/charts/tritoninferenceserver-1.1.1.tgz create mode 100644 charts/hypha/charts/tritoninferenceserver-1.1.2.tgz diff --git a/charts/hypha/Chart.lock b/charts/hypha/Chart.lock index 6afd006..d17d645 100644 --- 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 index f2af1b1..f87e935 100644 --- 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 deleted file mode 100644 index 17cabfb2a93512fbf3ce872946ab9b8bd2dfc3a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3473 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 diff --git a/charts/hypha/charts/tritoninferenceserver-1.1.2.tgz b/charts/hypha/charts/tritoninferenceserver-1.1.2.tgz new file mode 100644 index 0000000000000000000000000000000000000000..f25cb2172e5c391f517416e20fdf506c49de7a0c GIT binary patch literal 3486 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 literal 0 HcmV?d00001 diff --git a/charts/hypha/templates/deployment.yaml b/charts/hypha/templates/deployment.yaml index 127e4ca..318fd3d 100644 --- 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 index 33e4300..cb368db 100644 --- 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 index fa15b87..870d2eb 100644 --- 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 index e07de14..10b0c13 100644 --- 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 index 317907f..a0b3f6d 100644 --- 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