From f3ce983306e58050dd55f4fdfbc50388342ad9b6 Mon Sep 17 00:00:00 2001 From: Darren Lau Date: Fri, 30 Jun 2023 15:50:14 -0400 Subject: [PATCH] Make kminion helm chart compatible with K8s >= 1.25 --- charts/kminion/templates/hpa.yaml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/charts/kminion/templates/hpa.yaml b/charts/kminion/templates/hpa.yaml index 65e5319..41aaad5 100644 --- a/charts/kminion/templates/hpa.yaml +++ b/charts/kminion/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: {{ ternary "autoscaling/v2" "autoscaling/v2beta1" (.Capabilities.APIVersions.Has "autoscaling/v2") }} kind: HorizontalPodAutoscaler metadata: name: {{ include "kminion.fullname" . }} @@ -18,12 +18,24 @@ spec: - type: Resource resource: name: cpu + {{- if .Capabilities.APIVersions.Has "autoscaling/v2" }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + {{ else }} targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + {{- end }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory + {{- if .Capabilities.APIVersions.Has "autoscaling/v2" }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + {{ else }} targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + {{- end }} {{- end }} {{- end }}