Skip to content

Commit 5898ebe

Browse files
committed
Update helm chart
1 parent eed0f49 commit 5898ebe

File tree

8 files changed

+35
-29
lines changed

8 files changed

+35
-29
lines changed

lib/runtime/sdRuntime.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export const defaultProps: blueprints.addons.HelmAddOnProps & SDRuntimeAddOnProp
2828
name: 'sdRuntimeAddOn',
2929
namespace: 'sdruntime',
3030
release: 'sdruntime',
31-
version: '1.1.1',
31+
version: '1.1.3',
3232
repository: 'oci://public.ecr.aws/bingjiao/charts/sd-on-eks',
3333
values: {},
3434
type: "sdwebui"

src/charts/sd_on_eks/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ type: application
1313
# This is the chart version. This version number should be incremented each time you make changes
1414
# to the chart and its templates, including the app version.
1515
# Versions are expected to follow Semantic Versioning (https://semver.org/)
16-
version: 1.1.1
16+
version: 1.1.3
1717
# This is the version number of the application being deployed. This version number should be
1818
# incremented each time you make changes to the application. Versions are not expected to
1919
# follow Semantic Versioning. They should reflect the version the application is using.
2020
# It is recommended to use it with quotes.
21-
appVersion: "1.1.1"
21+
appVersion: "1.1.3"

src/charts/sd_on_eks/templates/aws-sqs-queue-scaledobject.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ spec:
1919
advanced:
2020
horizontalPodAutoscalerConfig:
2121
behavior:
22-
{{- toYaml .Values.runtime.extraHPAConfig | nindent 8 }}
22+
{{- toYaml .Values.runtime.scaling.extraHPAConfig | nindent 8 }}
2323
{{- end }}
2424
scaleTargetRef:
2525
name: {{ include "sdchart.fullname" . }}-inference-api

src/charts/sd_on_eks/templates/deployment-comfyui.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,14 @@ spec:
6464
{{- if .Values.runtime.queueAgent.extraEnv }}
6565
{{- toYaml .Values.runtime.queueAgent.extraEnv | nindent 8 }}
6666
{{- end }}
67-
{{- if .Values.runtime.queueAgent.XRay.enabled }}
67+
{{- if .Values.runtime.queueAgent.xray.enabled }}
6868
- name: AWS_XRAY_DAEMON_ADDRESS
6969
value: localhost:2000
7070
- name: AWS_XRAY_CONTEXT_MISSING
7171
value: IGNORE_ERROR
72+
{{- else }}
73+
- name: DISABLE_XRAY
74+
value: "true"
7275
{{- end }}
7376
image: {{ .Values.runtime.queueAgent.image.repository }}:{{ .Values.runtime.queueAgent.image.tag }}
7477
imagePullPolicy: {{ .Values.runtime.queueAgent.imagePullPolicy }}
@@ -77,9 +80,9 @@ spec:
7780
name: models
7881
resources:
7982
{{- toYaml .Values.runtime.queueAgent.resources | nindent 10 }}
80-
{{- if .Values.runtime.queueAgent.XRay.enabled }}
83+
{{- if .Values.runtime.queueAgent.xray.enabled }}
8184
- name: xray-daemon
82-
image: public.ecr.aws/xray/aws-xray-daemon:3.3.7
85+
image: {{ .Values.runtime.queueAgent.xray.daemon.image.repository }}:{{ .Values.runtime.queueAgent.xray.daemon.image.tag }}
8386
ports:
8487
- containerPort: 2000
8588
protocol: UDP

src/charts/sd_on_eks/templates/deployment-sdwebui.yaml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@ metadata:
1010
{{- toYaml .Values.runtime.labels | nindent 4 }}
1111
{{- end }}
1212
runtime-type: sdwebui
13-
1413
{{- if .Values.runtime.annotations }}
1514
annotations:
16-
{{ toYaml .Values.runtime.annotations | nindent 4 }}
15+
{{- toYaml .Values.runtime.annotations | nindent 4 }}
1716
{{- end }}
1817

1918
spec:
@@ -31,7 +30,7 @@ spec:
3130
metadata:
3231
labels:
3332
app: inference-api
34-
{{- include "sdchart.selectorLabels" . | nindent 8 }}
33+
{{- include "sdchart.selectorLabels" . | nindent 8 }}
3534
spec:
3635
containers:
3736
- name: inference-api
@@ -48,7 +47,7 @@ spec:
4847
value: "true"
4948
- name: CONFIG_FILE
5049
value: "/tmp/config.json"
51-
{{- if .Values.runtime.queueAgent.commandArguments }}
50+
{{- if .Values.runtime.inferenceApi.commandArguments }}
5251
- name: EXTRA_CMD_ARG
5352
value: {{ .Values.runtime.inferenceApi.commandArguments }}
5453
{{- end }}
@@ -78,19 +77,22 @@ spec:
7877
{{- if .Values.runtime.queueAgent.extraEnv }}
7978
{{- toYaml .Values.runtime.queueAgent.extraEnv | nindent 8 }}
8079
{{- end }}
81-
{{- if .Values.runtime.queueAgent.XRay.enabled }}
80+
{{- if .Values.runtime.queueAgent.xray.enabled }}
8281
- name: AWS_XRAY_DAEMON_ADDRESS
8382
value: localhost:2000
8483
- name: AWS_XRAY_CONTEXT_MISSING
8584
value: IGNORE_ERROR
85+
{{- else }}
86+
- name: DISABLE_XRAY
87+
value: "true"
8688
{{- end }}
8789
image: {{ .Values.runtime.queueAgent.image.repository }}:{{ .Values.runtime.queueAgent.image.tag }}
8890
imagePullPolicy: {{ .Values.runtime.queueAgent.imagePullPolicy }}
8991
resources:
9092
{{- toYaml .Values.runtime.queueAgent.resources | nindent 10 }}
91-
{{- if .Values.runtime.queueAgent.XRay.enabled }}
93+
{{- if .Values.runtime.queueAgent.xray.enabled }}
9294
- name: xray-daemon
93-
image: public.ecr.aws/xray/aws-xray-daemon:3.3.7
95+
image: {{ .Values.runtime.queueAgent.xray.daemon.image.repository }}:{{ .Values.runtime.queueAgent.xray.daemon.image.tag }}
9496
ports:
9597
- containerPort: 2000
9698
protocol: UDP

src/charts/sd_on_eks/templates/persistentvolume-s3.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,23 @@ apiVersion: v1
33
kind: PersistentVolume
44
metadata:
55
name: {{ include "sdchart.fullname" . }}-s3-model-volume
6-
annotations:
76
{{- if .Values.runtime.persistence.annotations }}
87
annotations:
9-
{{ toYaml .Values.runtime.persistence.annotations | indent 4 }}
8+
{{ toYaml .Values.runtime.persistence.annotations | nindent 4 }}
109
{{- end }}
1110
labels:
1211
{{- include "sdchart.labels" . | nindent 4 }}
1312
{{- if .Values.runtime.labels }}
1413
{{- toYaml .Values.runtime.labels | nindent 4 }}
1514
{{- end }}
1615
{{- if .Values.runtime.persistence.labels }}
17-
{{ toYaml .Values.runtime.persistence.labels | indent 4 }}
16+
{{- toYaml .Values.runtime.persistence.labels | nindent 4 }}
1817
{{- end }}
1918
spec:
2019
capacity:
2120
storage: {{ .Values.runtime.persistence.size }}
2221
accessModes:
23-
{{ toYaml .Values.runtime.persistence.accessModes }}
22+
{{- toYaml .Values.runtime.persistence.accessModes | nindent 2 }}
2423
mountOptions:
2524
- allow-delete
2625
- allow-other
Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,34 @@
11
{{- if and (.Values.runtime.persistence.enabled) (not (.Values.runtime.persistence.existingClaim)) }}
2-
32
apiVersion: v1
43
kind: PersistentVolumeClaim
54
metadata:
65
name: {{ include "sdchart.fullname" . }}-model-claim
76
{{- if .Values.runtime.persistence.annotations }}
87
annotations:
9-
{{ toYaml .Values.runtime.persistence.annotations | indent 4 }}
8+
{{- toYaml .Values.runtime.persistence.annotations | nindent 4 }}
109
{{- end }}
1110
labels:
1211
{{- include "sdchart.labels" . | nindent 4 }}
1312
{{- if .Values.runtime.labels }}
1413
{{- toYaml .Values.runtime.labels | nindent 4 }}
1514
{{- end }}
1615
{{- if .Values.runtime.persistence.labels }}
17-
{{ toYaml .Values.runtime.persistence.labels | indent 4 }}
16+
{{- toYaml .Values.runtime.persistence.labels | nindent 4 }}
1817
{{- end }}
1918
spec:
2019
accessModes:
21-
{{ toYaml .Values.runtime.persistence.accessModes }}
20+
{{- toYaml .Values.runtime.persistence.accessModes | nindent 2 }}
2221
resources:
2322
requests:
2423
storage: "{{ .Values.runtime.persistence.size }}"
25-
{{- if .Values.runtime.persistence.storageClass }}
26-
{{- if (eq "-" .Values.runtime.persistence.storageClass) }}
24+
{{- if .Values.runtime.persistence.storageClass }}
25+
{{- if (eq "-" .Values.runtime.persistence.storageClass) }}
2726
storageClassName: ""
28-
{{- else }}
27+
{{- else }}
2928
storageClassName: "{{ .Values.runtime.persistence.storageClass }}"
30-
{{- end }}
31-
{{- end }}
29+
{{- end }}
30+
{{- end }}
3231
{{- if .Values.runtime.persistence.existingVolume }}
3332
volumeName: "{{ .Values.runtime.persistence.existingVolume }}"
3433
{{- end }}
35-
3634
{{- end }}

src/charts/sd_on_eks/values.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,12 @@ runtime:
8484
requests:
8585
cpu: 500m
8686
memory: 512Mi
87-
XRay:
87+
xray:
8888
enabled: true
89+
daemon:
90+
image:
91+
repository: public.ecr.aws/xray/aws-xray-daemon
92+
tag: 3.3.14
8993
persistence:
9094
enabled: true
9195
existingClaim: ""

0 commit comments

Comments
 (0)