Skip to content

Commit

Permalink
Merge pull request #7 from amun-ai/dev
Browse files Browse the repository at this point in the history
typo in triton naming
  • Loading branch information
ctr26 authored May 23, 2023
2 parents 4802e27 + a3c3d6d commit a9ecce4
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion charts/hypha/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependencies:
- name: minio
repository: https://charts.min.io/
version: 3.3.0
- name: tritoninfereceserver-hypha
- name: tritoninferenceserver-hypha
repository: file://../tritoninferenceserver-hypha
version: 1.0.2
- name: redis
Expand Down
8 changes: 4 additions & 4 deletions charts/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: 0.15.10
version: 0.15.11

# 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 Expand Up @@ -45,10 +45,10 @@ dependencies:
# version: 3.35.0
# repository: https://kubernetes.github.io/ingress-nginx
# condition: ingress-nginx.enabled
- name: tritoninfereceserver-hypha
- name: tritoninferenceserver-hypha
repository: "file://../tritoninferenceserver-hypha"
version: 1.0.2
condition: tritoninfereceserver-hypha.enabled
version: 1.0.3
condition: tritoninferenceserver-hypha.enabled
- name: redis
repository: "https://charts.bitnami.com/bitnami"
version: 17.9.4
Expand Down
2 changes: 1 addition & 1 deletion charts/hypha/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
{{- end -}}

{{- define "triton.url" -}}
{{- if (index .Values "tritoninfereceserver-hypha" "enabled") -}}
{{- if (index .Values "tritoninferenceserver-hypha" "enabled") -}}
{{- printf "http://tritoninferenceserver.%s.svc.cluster.local:%s" (.Values.namespace | default .Release.Namespace) "8000" -}}
{{- else -}}
{{ .Values.triton_url}}
Expand Down
6 changes: 3 additions & 3 deletions charts/hypha/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
{{- end }}


{{- if (index .Values "tritoninfereceserver-hypha" "enabled") }}
{{- if (index .Values "tritoninferenceserver-hypha" "enabled") }}
{{ $TRITON_URL = "http://tritoninferenceserver:8000" }}
{{- end }}

Expand Down Expand Up @@ -59,8 +59,8 @@ spec:
--secret-access-key={{ $S3_SECRET_KEY }} \
--endpoint-url=http://{{ .Values.minio.fullnameOverride }}:{{.Values.minio.service.port}} \
--endpoint-url-public={{ $S3_ENDPOINT_URL_PUBLIC }} \
{{- if (index .Values "tritoninfereceserver-hypha" "enabled") }}
--triton-servers=http://{{(index .Values "tritoninfereceserver-hypha" "fullnameOverride")}}:{{(index .Values "tritoninfereceserver-hypha" "service" "port")}} \
{{- if (index .Values "tritoninferenceserver-hypha" "enabled") }}
--triton-servers=http://{{(index .Values "tritoninferenceserver-hypha" "fullnameOverride")}}:{{(index .Values "tritoninferenceserver-hypha" "service" "port")}} \
{{- end }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
Expand Down
2 changes: 1 addition & 1 deletion charts/hypha/templates/deployment.yaml.ignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
{{- end }}


{{- if (index .Values "tritoninfereceserver-hypha" "enabled") }}
{{- if (index .Values "tritoninferenceserver-hypha" "enabled") }}
{{ $TRITON_URL = "http://tritoninferenceserver:8000" }}
{{- end }}

Expand Down
Empty file added charts/hypha/templates/minio
Empty file.
4 changes: 2 additions & 2 deletions charts/hypha/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ minio:
persistence:
size: 10Gi

tritoninfereceserver-hypha:
tritoninferenceserver-hypha:
enabled: true
fullnameOverride: "tritoninfereceserver"
fullnameOverride: "tritoninferenceserver"
replicaCount: 1
image:
imageName: nvcr.io/nvidia/tritonserver:21.10-py3
Expand Down
4 changes: 2 additions & 2 deletions charts/tritoninferenceserver-hypha/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
name: tritoninfereceserver-hypha
name: tritoninferenceserver-hypha
description: A Helm chart for deploying ImJoy App Engine to Kubernetes

# A chart can be either an 'application' or a 'library' chart.
Expand All @@ -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.2
version: 1.0.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
Expand Down
2 changes: 1 addition & 1 deletion charts/tritoninferenceserver-hypha/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ ingress:
# # memory: 128Mi

service:
name: tritoninfereceserver
name: tritoninferenceserver
type: ClusterIP
# sessionAffinity: None
# sessionAffinityConfig: {}
Expand Down

0 comments on commit a9ecce4

Please sign in to comment.