From 435b536ae88a7802082491954e0b37019fd36fbc Mon Sep 17 00:00:00 2001 From: Christophe de Carvalho Date: Thu, 31 Aug 2023 11:53:53 +0100 Subject: [PATCH] feat(deployment): genreate horizontal pod autoscaling proper version based on k8s version Signed-off-by: Christophe de Carvalho --- deployment/chainloop/templates/cas/hpa.yaml | 16 ++++++++++++++-- .../chainloop/templates/controlplane/hpa.yaml | 14 +++++++++++++- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/deployment/chainloop/templates/cas/hpa.yaml b/deployment/chainloop/templates/cas/hpa.yaml index c556e9f5b..e5db27edd 100644 --- a/deployment/chainloop/templates/cas/hpa.yaml +++ b/deployment/chainloop/templates/cas/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.cas.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: {{ include "common.capabilities.hpa.apiVersion" ( dict "context" $ ) }} kind: HorizontalPodAutoscaler metadata: name: {{ include "chainloop.cas.fullname" . }} @@ -7,7 +7,7 @@ metadata: {{- include "chainloop.cas.labels" . | nindent 4 }} spec: scaleTargetRef: - apiVersion: apps/v1 + apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }} kind: Deployment name: {{ include "chainloop.cas.fullname" . }} minReplicas: {{ .Values.cas.autoscaling.minReplicas }} @@ -17,12 +17,24 @@ spec: - type: Resource resource: name: cpu + {{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }} targetAverageUtilization: {{ .Values.cas.autoscaling.targetCPUUtilizationPercentage }} + {{- else }} + target: + type: Utilization + averageUtilization: {{ .Values.cas.autoscaling.targetCPUUtilizationPercentage }} + {{- end }} {{- end }} {{- if .Values.cas.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory + {{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }} targetAverageUtilization: {{ .Values.cas.autoscaling.targetMemoryUtilizationPercentage }} + {{- else }} + target: + type: Utilization + averageUtilization: {{ .Values.cas.autoscaling.targetMemoryUtilizationPercentage }} + {{- end }} {{- end }} {{- end }} diff --git a/deployment/chainloop/templates/controlplane/hpa.yaml b/deployment/chainloop/templates/controlplane/hpa.yaml index 8e7e520fc..9afe2e531 100644 --- a/deployment/chainloop/templates/controlplane/hpa.yaml +++ b/deployment/chainloop/templates/controlplane/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.controlplane.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: {{ include "common.capabilities.hpa.apiVersion" ( dict "context" $ ) }} kind: HorizontalPodAutoscaler metadata: name: {{ include "chainloop.controlplane.fullname" . }} @@ -17,12 +17,24 @@ spec: - type: Resource resource: name: cpu + {{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }} targetAverageUtilization: {{ .Values.controlplane.autoscaling.targetCPUUtilizationPercentage }} + {{- else }} + target: + type: Utilization + averageUtilization: {{ .Values.controlplane.autoscaling.targetCPUUtilizationPercentage }} + {{- end }} {{- end }} {{- if .Values.controlplane.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory + {{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }} targetAverageUtilization: {{ .Values.controlplane.autoscaling.targetMemoryUtilizationPercentage }} + {{- else }} + target: + type: Utilization + averageUtilization: {{ .Values.controlplane.autoscaling.targetMemoryUtilizationPercentage }} + {{- end }} {{- end }} {{- end }}