Update helm chart

Author: yubingjiaocn

lib/runtime/sdRuntime.ts

@@ -28,7 +28,7 @@ export const defaultProps: blueprints.addons.HelmAddOnProps & SDRuntimeAddOnProp
   name: 'sdRuntimeAddOn',
   namespace: 'sdruntime',
   release: 'sdruntime',
-  version: '1.1.1',
+  version: '1.1.3',
   repository: 'oci://public.ecr.aws/bingjiao/charts/sd-on-eks',
   values: {},
   type: "sdwebui"

src/charts/sd_on_eks/Chart.yaml

@@ -13,9 +13,9 @@ 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.1.1
+version: 1.1.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
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.1.1"
+appVersion: "1.1.3"

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

@@ -19,7 +19,7 @@ spec:
   advanced:
     horizontalPodAutoscalerConfig:
       behavior:
-      {{- toYaml .Values.runtime.extraHPAConfig | nindent 8 }}
+      {{- toYaml .Values.runtime.scaling.extraHPAConfig | nindent 8 }}
   {{- end }}
   scaleTargetRef:
     name: {{ include "sdchart.fullname" . }}-inference-api

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

@@ -64,11 +64,14 @@ spec:
         {{- if .Values.runtime.queueAgent.extraEnv }}
         {{- toYaml .Values.runtime.queueAgent.extraEnv | nindent 8 }}
         {{- end }}
-        {{- if .Values.runtime.queueAgent.XRay.enabled }}
+        {{- if .Values.runtime.queueAgent.xray.enabled }}
         - name: AWS_XRAY_DAEMON_ADDRESS
           value: localhost:2000
         - name: AWS_XRAY_CONTEXT_MISSING
           value: IGNORE_ERROR
+        {{- else }}
+        - name: DISABLE_XRAY
+          value: "true"
         {{- end }}
         image: {{ .Values.runtime.queueAgent.image.repository }}:{{ .Values.runtime.queueAgent.image.tag }}
         imagePullPolicy: {{ .Values.runtime.queueAgent.imagePullPolicy }}
@@ -77,9 +80,9 @@ spec:
           name: models
         resources:
         {{- toYaml .Values.runtime.queueAgent.resources | nindent 10 }}
-      {{- if .Values.runtime.queueAgent.XRay.enabled }}
+      {{- if .Values.runtime.queueAgent.xray.enabled }}
       - name: xray-daemon
-        image: public.ecr.aws/xray/aws-xray-daemon:3.3.7
+        image: {{ .Values.runtime.queueAgent.xray.daemon.image.repository }}:{{ .Values.runtime.queueAgent.xray.daemon.image.tag }}
         ports:
         - containerPort: 2000
           protocol: UDP

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

@@ -10,10 +10,9 @@ metadata:
   {{- toYaml .Values.runtime.labels | nindent 4 }}
   {{- end }}
     runtime-type: sdwebui
-
   {{- if .Values.runtime.annotations }}
   annotations:
-  {{ toYaml .Values.runtime.annotations | nindent 4 }}
+  {{- toYaml .Values.runtime.annotations | nindent 4 }}
   {{- end }}
 
 spec:
@@ -31,7 +30,7 @@ spec:
     metadata:
       labels:
         app: inference-api
-      {{- include "sdchart.selectorLabels" . | nindent 8 }}
+        {{- include "sdchart.selectorLabels" . | nindent 8 }}
     spec:
       containers:
       - name: inference-api
@@ -48,7 +47,7 @@ spec:
           value: "true"
         - name: CONFIG_FILE
           value: "/tmp/config.json"
-        {{- if .Values.runtime.queueAgent.commandArguments }}
+        {{- if .Values.runtime.inferenceApi.commandArguments }}
         - name: EXTRA_CMD_ARG
           value: {{ .Values.runtime.inferenceApi.commandArguments }}
         {{- end }}
@@ -78,19 +77,22 @@ spec:
         {{- if .Values.runtime.queueAgent.extraEnv }}
         {{- toYaml .Values.runtime.queueAgent.extraEnv | nindent 8 }}
         {{- end }}
-        {{- if .Values.runtime.queueAgent.XRay.enabled }}
+        {{- if .Values.runtime.queueAgent.xray.enabled }}
         - name: AWS_XRAY_DAEMON_ADDRESS
           value: localhost:2000
         - name: AWS_XRAY_CONTEXT_MISSING
           value: IGNORE_ERROR
+        {{- else }}
+        - name: DISABLE_XRAY
+          value: "true"
         {{- end }}
         image: {{ .Values.runtime.queueAgent.image.repository }}:{{ .Values.runtime.queueAgent.image.tag }}
         imagePullPolicy: {{ .Values.runtime.queueAgent.imagePullPolicy }}
         resources:
         {{- toYaml .Values.runtime.queueAgent.resources | nindent 10 }}
-      {{- if .Values.runtime.queueAgent.XRay.enabled }}
+      {{- if .Values.runtime.queueAgent.xray.enabled }}
       - name: xray-daemon
-        image: public.ecr.aws/xray/aws-xray-daemon:3.3.7
+        image: {{ .Values.runtime.queueAgent.xray.daemon.image.repository }}:{{ .Values.runtime.queueAgent.xray.daemon.image.tag }}
         ports:
         - containerPort: 2000
           protocol: UDP

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

@@ -3,24 +3,23 @@ apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: {{ include "sdchart.fullname" . }}-s3-model-volume
-  annotations:
   {{- if .Values.runtime.persistence.annotations }}
   annotations:
-  {{ toYaml .Values.runtime.persistence.annotations | indent 4 }}
+  {{ toYaml .Values.runtime.persistence.annotations | nindent 4 }}
   {{- end }}
   labels:
   {{- include "sdchart.labels" . | nindent 4 }}
   {{- if .Values.runtime.labels }}
   {{- toYaml .Values.runtime.labels | nindent 4 }}
   {{- end }}
   {{- if .Values.runtime.persistence.labels }}
-  {{ toYaml .Values.runtime.persistence.labels | indent 4 }}
+  {{- toYaml .Values.runtime.persistence.labels | nindent 4 }}
   {{- end }}
 spec:
   capacity:
     storage: {{ .Values.runtime.persistence.size }}
   accessModes:
-  {{ toYaml .Values.runtime.persistence.accessModes }}
+  {{- toYaml .Values.runtime.persistence.accessModes | nindent 2 }}
   mountOptions:
   - allow-delete
   - allow-other

src/charts/sd_on_eks/templates/persistentvolumeclaim.yaml

@@ -1,36 +1,34 @@
 {{- if and (.Values.runtime.persistence.enabled) (not (.Values.runtime.persistence.existingClaim)) }}
-
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: {{ include "sdchart.fullname" . }}-model-claim
   {{- if .Values.runtime.persistence.annotations }}
   annotations:
-  {{ toYaml .Values.runtime.persistence.annotations | indent 4 }}
+  {{- toYaml .Values.runtime.persistence.annotations | nindent 4 }}
   {{- end }}
   labels:
   {{- include "sdchart.labels" . | nindent 4 }}
   {{- if .Values.runtime.labels }}
   {{- toYaml .Values.runtime.labels | nindent 4 }}
   {{- end }}
   {{- if .Values.runtime.persistence.labels }}
-  {{ toYaml .Values.runtime.persistence.labels | indent 4 }}
+  {{- toYaml .Values.runtime.persistence.labels | nindent 4 }}
   {{- end }}
 spec:
   accessModes:
-  {{ toYaml .Values.runtime.persistence.accessModes }}
+  {{- toYaml .Values.runtime.persistence.accessModes | nindent 2 }}
   resources:
     requests:
       storage: "{{ .Values.runtime.persistence.size }}"
-      {{- if .Values.runtime.persistence.storageClass }}
-      {{- if (eq "-" .Values.runtime.persistence.storageClass) }}
+  {{- if .Values.runtime.persistence.storageClass }}
+  {{- if (eq "-" .Values.runtime.persistence.storageClass) }}
   storageClassName: ""
-      {{- else }}
+  {{- else }}
   storageClassName: "{{ .Values.runtime.persistence.storageClass }}"
-      {{- end }}
-      {{- end }}
+  {{- end }}
+  {{- end }}
   {{- if .Values.runtime.persistence.existingVolume }}
   volumeName: "{{ .Values.runtime.persistence.existingVolume }}"
   {{- end }}
-
 {{- end }}

src/charts/sd_on_eks/values.yaml

@@ -84,8 +84,12 @@ runtime:
       requests:
         cpu: 500m
         memory: 512Mi
-    XRay:
+    xray:
       enabled: true
+      daemon:
+        image:
+          repository: public.ecr.aws/xray/aws-xray-daemon
+          tag: 3.3.14
   persistence:
     enabled: true
     existingClaim: ""