Merge pull request #18 from amun-ai/dev

Dev
amun-ai · Feb 7, 2024 · 48ead34 · 48ead34
2 parents 97d82ac + 8dc8896
commit 48ead34
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 45 deletions.
diff --git a/charts/hypha/Chart.lock b/charts/hypha/Chart.lock
@@ -4,9 +4,9 @@ dependencies:
   version: 3.3.0
 - name: tritoninferenceserver-hypha
   repository: file://../tritoninferenceserver-hypha
-  version: 1.0.10
+  version: 1.0.12
 - name: redis
   repository: https://charts.bitnami.com/bitnami
   version: 17.11.6
-digest: sha256:ba419e9dfd6466525a1a79300561426246d52099e73a1689054bdacf38c5015c
-generated: "2024-02-01T15:04:42.562559748Z"
+digest: sha256:b88fc0133e5328a56c6aef65d3867f212f95094704530dcc88cb0f03f10dbd55
+generated: "2024-02-07T15:41:56.884037515Z"
diff --git a/charts/hypha/Chart.yaml b/charts/hypha/Chart.yaml
@@ -13,7 +13,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.16.12
+version: 0.16.14
 # 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.
@@ -30,7 +30,7 @@ dependencies:
 #   condition: tritoninferenceserver.enabled
 - name: tritoninferenceserver-hypha
   repository: "file://../tritoninferenceserver-hypha"
-  version: 1.0.10
+  version: 1.0.12
   condition: tritoninferenceserver-hypha.enabled
 - name: redis
   repository: "https://charts.bitnami.com/bitnami"

diff --git a/charts/hypha/charts/tritoninferenceserver-hypha-1.0.10.tgz b/charts/hypha/charts/tritoninferenceserver-hypha-1.0.10.tgz
diff --git a/charts/hypha/charts/tritoninferenceserver-hypha-1.0.12.tgz b/charts/hypha/charts/tritoninferenceserver-hypha-1.0.12.tgz
diff --git a/charts/hypha/templates/deployment.yaml b/charts/hypha/templates/deployment.yaml
@@ -54,10 +54,10 @@ spec:
       labels:
         {{- include "hypha.selectorLabels" . | nindent 8 }}
     spec:
-      {{- if .Values.nodeSelector }}
       nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 8 }}
-      {{- end }}
+      securityContext:
+{{ toYaml .Values.securityContext | indent 8 }}
       containers:
       - name:  {{ .Chart.Name }}
         command: ["/bin/sh", "-c"]

diff --git a/charts/hypha/values.yaml b/charts/hypha/values.yaml
@@ -12,6 +12,8 @@ auth0_audience: ""
 auth0_domain: ""
 jwt_secret: "xZ/aDcP+PfoTWgwA9ZADTtU/+djwMeMKz4QlSKRcgEs="
 nodeSelector: {}
+podLabels: {}
+securityContext: {}
 # TODO
 # Currently disabled in template because no obvious
 # way to pass in the scripts to deployment

diff --git a/charts/tritoninferenceserver-hypha/Chart.yaml b/charts/tritoninferenceserver-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: 1.0.10
+version: 1.0.12
 
 # 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-hypha/templates/deployment.yaml b/charts/tritoninferenceserver-hypha/templates/deployment.yaml
@@ -23,13 +23,11 @@ spec:
 {{ toYaml .Values.podLabels | indent 8 }}
         {{- end }}
     spec:
-      {{- if .Values.nodeSelector }}
       nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 8 }}
-      {{- end }}
       securityContext:
+{{ toYaml .Values.securityContext | indent 8 }}
         # fsGroup: 1000
-        runAsUser: 0
       initContainers:
 {{ toYaml .Values.initContainers | indent 8 }}
       containers:

diff --git a/charts/tritoninferenceserver-hypha/templates/tests/triton-test.yaml b/charts/tritoninferenceserver-hypha/templates/tests/triton-test.yaml
diff --git a/charts/tritoninferenceserver-hypha/values.yaml b/charts/tritoninferenceserver-hypha/values.yaml
@@ -6,13 +6,13 @@ image:
   modelSnapshots: /model-snapshots
   modelRepository: /model-repository
   modelStore: /model-repository
-  numGpus: 0
   s3Endpoint: ""
   s3Bucket: ""
   env:
   - name: TF_FORCE_GPU_ALLOW_GROWTH
     value: "true"
 
+
 ingress:
   enabled: false
   className: nginx
@@ -54,6 +54,7 @@ autoscaling:
 
 nodeSelector: {}
 podLabels: {}
+securityContext: {}
 
 readinessProbe:
   httpGet:
@@ -75,19 +76,7 @@ livenessProbe:
   successThreshold: 1
   failureThreshold: 3
 
-initContainers:
-- name: get-models
-  image: alpine/git
-  volumeMounts:
-  - mountPath: /model-repository
-    name: triton-cache
-    subPath: model-repository
-  command: ["/bin/sh", "-c"]
-  args:
-  - |
-    git clone https://github.com/triton-inference-server/server.git &&
-    cp -r server/docs/examples/model_repository/. /model-repository
-
+initContainers: []
 
 # - name: copy-models
 #   image: alpine