Merge pull request #1 from amun-ai/dev

Dev
amun-ai · May 11, 2023 · b65c16a · b65c16a
2 parents 36a8068 + 1f2e812
commit b65c16a
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 28 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 secrets.yaml
+.history
diff --git a/charts/hypha/Chart.lock b/charts/hypha/Chart.lock
@@ -10,6 +10,6 @@ dependencies:
   version: 1.0.1
 - name: redis
   repository: https://charts.bitnami.com/bitnami
-  version: 16.5.2
-digest: sha256:2f1f2f3028268f55782273f0cc4b5d7533a0c41c1c131a97cda03b493ad2a16f
-generated: "2022-08-04T11:18:20.681110935+01:00"
+  version: 17.9.4
+digest: sha256:fceac355f716ad2a0cce8996b67184e3d3d7e7eb0a4809731aea9972a2c4ea53
+generated: "2023-04-14T15:44:34.43437689+01:00"
diff --git a/charts/hypha/Chart.yaml b/charts/hypha/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: 0.15.8-4
+version: 0.15.8-5
 
 # 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
@@ -51,5 +51,5 @@ dependencies:
     condition: tritoninfereceserver-hypha.enabled
   - name: redis
     repository: "https://charts.bitnami.com/bitnami"
-    version: 16.5.2
+    version: 17.9.4
     condition: redis.enabled
diff --git a/charts/hypha/charts/redis-17.9.4.tgz b/charts/hypha/charts/redis-17.9.4.tgz
diff --git a/charts/hypha/charts/tritoninfereceserver-hypha-1.0.1.tgz b/charts/hypha/charts/tritoninfereceserver-hypha-1.0.1.tgz
diff --git a/charts/tritoninferenceserver-hypha/templates/deployment.yaml b/charts/tritoninferenceserver-hypha/templates/deployment.yaml
@@ -52,17 +52,21 @@ spec:
       securityContext:
         # fsGroup: 1000
         runAsUser: 0
-      initContainers:
-        - name: model-copy-s3
-          # image: amazon/aws-cli
-          image: amazon/aws-cli
-          command: ["/bin/sh", "-c"]
-          args:
-            - >
-              aws --no-sign-request --endpoint-url {{ .Values.image.s3Endpoint }} s3 sync {{ .Values.image.s3Bucket }} {{ .Values.image.modelRepositoryPath }}
-          volumeMounts:
-            - mountPath: {{ .Values.image.modelRepositoryPath }}
-              name: model-repository
+        # TOO SLOW 
+      # initContainers:
+      #   - name: model-mount-s3
+      #     image: efrecon/s3fs
+      #     command: ["/bin/sh", "-c"]
+      #     args:
+      #     - >
+      #       mkdir -p {{ .Values.image.modelRepositoryPath }};
+      #       s3fs {{ .Values.image.s3Bucket }} {{ .Values.image.modelRepositoryPath }} -o url={{ .Values.image.s3Endpoint }} -o use_path_request_style -o nonempty -o public_bucket=1;
+      #       chmod -R g+rw {{ .Values.image.modelRepositoryPath }}
+      #     securityContext:
+      #       runAsUser: 0
+      #     volumeMounts:
+      #     - mountPath: {{ .Values.image.modelRepositoryPath }}
+      #       name: model-repository
       containers:
         - name: tritoninferenceserver
           image: {{ .Values.image.imageName }}
@@ -79,16 +83,17 @@ spec:
           - name: MODEL_SNAPSHOTS_DIRECTORY
             value: "{{ .Values.image.modelSnapshotsPath }}"
           imagePullPolicy: IfNotPresent
-          livenessProbe:
-            httpGet:
-              path: /v2/health/live
-              port: http
-          readinessProbe:
-            initialDelaySeconds: 500
-            periodSeconds: 5
-            httpGet:
-              path: /v2/health/ready
-              port: http
+        #   TODO Fix probe checks
+        #   livenessProbe:
+        #     httpGet:
+        #       path: /v2/health/live
+        #       port: http
+        #   readinessProbe:
+        #     initialDelaySeconds: 500
+        #     periodSeconds: 5
+        #     httpGet:
+        #       path: /v2/health/ready
+        #       port: http
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           command: ["/bin/sh"]
@@ -97,7 +102,7 @@ spec:
             - >-
               apt update -yq &&
               apt install libgl1-mesa-glx -y &&
-              tritonserver --model-store={{ .Values.image.modelRepositoryPath }} --log-verbose=1 --model-control-mode=poll --repository-poll-secs=60 --exit-on-error=false
+              tritonserver --model-store={{ .Values.image.modelStore }} --log-verbose=1 --model-control-mode=poll --repository-poll-secs=60 --exit-on-error=false --model-repository={{ .Values.image.modelRepository}}
           ports:
             - containerPort: 8000
               name: http

diff --git a/charts/tritoninferenceserver-hypha/values.yaml b/charts/tritoninferenceserver-hypha/values.yaml
@@ -1,6 +1,6 @@
 replicaCount: 1
 image:
-  imageName: nvcr.io/nvidia/tritonserver:22.04-py3
+  imageName: nvcr.io/nvidia/tritonserver:23.04-py3
   pullPolicy: IfNotPresent
   # modelRepositoryPath: s3://imjoy-s3.pasteur.fr:80/model-repository
   modelRepositoryPath: /model-repository