fix(chart): Pass metrics and behaviour as whole dicts

SwanseaUniversityMedical · Nov 15, 2023 · 085fb88 · 085fb88
1 parent 5b2bcc2
commit 085fb88
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/charts/trino/templates/autoscaler.yaml b/charts/trino/templates/autoscaler.yaml
@@ -10,17 +10,13 @@ spec:
     apiVersion: apps/v1
     kind: Deployment
     name: {{ template "trino.worker" . }}
+  {{- if .Values.server.autoscaling.metrics }}
   metrics:
-    {{- if .Values.server.autoscaling.targetCPUUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: cpu
-        targetAverageUtilization: {{ .Values.server.autoscaling.targetCPUUtilizationPercentage }}
-    {{- end }}
-    {{- if .Values.server.autoscaling.targetMemoryUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: memory
-        targetAverageUtilization: {{ .Values.server.autoscaling.targetMemoryUtilizationPercentage }}
-      {{- end }}
+  {{-  tpl (toYaml .Values.server.autoscaling.metrics) . | nindent 4 }}
+  {{- end }}
+  {{- if .Values.server.autoscaling.behavior }}
+  behavior:
+  {{-  tpl (toYaml .Values.server.autoscaling.behavior) . | nindent 4 }}
+  {{- end }}
+
 {{- end }}
diff --git a/charts/trino/values.yaml b/charts/trino/values.yaml
@@ -56,8 +56,12 @@ server:
   autoscaling:
     enabled: false
     maxReplicas: 5
-    targetCPUUtilizationPercentage: 50
-    targetMemoryUtilizationPercentage:
+    metrics:
+      - type: Resource
+        resource:
+          name: cpu
+          targetAverageUtilization: 50
+    behavior:
 
 # use this to override the standard entrypoint when you need to use the vault agent injector
 entrypointOverride: {}