[prometheus-statsd-exporter] allow to set lifecycle to deployment (#4171

) * [prometheus-statsd-exporter] allow to set lifecycle to deployment Signed-off-by: gavin.jeong <[email protected]> * [prometheus-statsd-exporter] Reorder HPA target to fix ordering HPA target problem Signed-off-by: gavin.jeong <[email protected]> * Update charts/prometheus-statsd-exporter/values.yaml Co-authored-by: zeritti <[email protected]> Signed-off-by: Gavin <[email protected]> --------- Signed-off-by: gavin.jeong <[email protected]> Signed-off-by: Gavin <[email protected]> Co-authored-by: zeritti <[email protected]>
prometheus-community · Jan 27, 2024 · 5d451e6 · 5d451e6
1 parent 868aba0
commit 5d451e6
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git a/charts/prometheus-statsd-exporter/Chart.yaml b/charts/prometheus-statsd-exporter/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: prometheus-statsd-exporter
 description: A Helm chart for prometheus stats-exporter
-version: 0.11.0
+version: 0.12.0
 appVersion: v0.26.0
 home: https://github.com/prometheus/statsd_exporter
 sources:

diff --git a/charts/prometheus-statsd-exporter/templates/deployment.yaml b/charts/prometheus-statsd-exporter/templates/deployment.yaml
@@ -90,6 +90,10 @@ spec:
             - name: statsd-mapping-config
               mountPath: /etc/prometheus-statsd-exporter
           {{- end }}
+          {{- if .Values.lifecycle }}
+          lifecycle: 
+            {{- toYaml .Values.lifecycle | nindent 12 }}
+          {{- end }}
       {{- if or .Values.statsd.mappingConfigMapName .Values.statsd.mappingConfig }}
       volumes:
         - name: statsd-mapping-config

diff --git a/charts/prometheus-statsd-exporter/templates/hpa.yaml b/charts/prometheus-statsd-exporter/templates/hpa.yaml
@@ -14,14 +14,6 @@ spec:
   maxReplicas: {{ .Values.autoscaling.maxReplicas }}
   metrics:
     {{- if eq (include "prometheus-statsd-exporter.hpa.apiVersion" .) "autoscaling/v2" -}}
-    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: cpu
-        target:
-          type: Utilization
-          averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
-    {{- end }}
     {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
     - type: Resource
       resource:
@@ -30,18 +22,26 @@ spec:
           type: Utilization
           averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
     {{- end }}
-    {{- else -}}
     {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
     - type: Resource
       resource:
         name: cpu
-        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
     {{- end }}
+    {{- else -}}
     {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
     - type: Resource
       resource:
         name: memory
         targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
     {{- end -}}
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
     {{- end }}
 {{- end }}
diff --git a/charts/prometheus-statsd-exporter/values.yaml b/charts/prometheus-statsd-exporter/values.yaml
@@ -163,6 +163,10 @@ autoscaling:
   targetCPUUtilizationPercentage: 80
   # targetMemoryUtilizationPercentage: 80
 
+# Container lifecycle hooks
+# Ref. https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/
+lifecycle: {}
+
 nodeSelector: {}
 
 tolerations: []