Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #18

Merged
merged 4 commits into from
Feb 7, 2024
Merged

Dev #18

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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: 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"
4 changes: 2 additions & 2 deletions charts/hypha/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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"
Expand Down
Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions charts/hypha/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 2 additions & 0 deletions charts/hypha/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion charts/tritoninferenceserver-hypha/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.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
Expand Down
4 changes: 1 addition & 3 deletions charts/tritoninferenceserver-hypha/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

This file was deleted.

17 changes: 3 additions & 14 deletions charts/tritoninferenceserver-hypha/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -54,6 +54,7 @@ autoscaling:

nodeSelector: {}
podLabels: {}
securityContext: {}

readinessProbe:
httpGet:
Expand All @@ -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
Expand Down
Loading