[bitnami/magento] Use the new helper for HPA API version (#10203)

* Use the new helper for HPA API version

Signed-off-by: Miguel A. Cabrera Minagorri <devgorri@gmail.com>

* Contemplate targetAverageUtilization

Signed-off-by: Miguel A. Cabrera Minagorri <devgorri@gmail.com>
This commit is contained in:
Miguel Ángel Cabrera Miñagorri
2022-05-13 17:05:33 +02:00
committed by GitHub
parent c49cf7b6d7
commit 1717aff3bb
3 changed files with 19 additions and 7 deletions

View File

@@ -1,12 +1,12 @@
dependencies:
- name: mariadb
repository: https://charts.bitnami.com/bitnami
version: 11.0.2
version: 11.0.3
- name: elasticsearch
repository: https://charts.bitnami.com/bitnami
version: 18.0.1
version: 18.0.3
- name: common
repository: https://charts.bitnami.com/bitnami
version: 1.13.1
digest: sha256:8130a33fa421cc2f1b177ed14ff24ff573ff3640fdabd115d31c78f651ee242b
generated: "2022-05-05T10:58:35.358915+02:00"
version: 1.14.0
digest: sha256:6c57e7684a5e97692c6aa4ed9d121c58a2571a8fb305501e81a19a7ef571c9a0
generated: "2022-05-13T15:11:53.945826+02:00"

View File

@@ -35,4 +35,4 @@ name: magento
sources:
- https://github.com/bitnami/bitnami-docker-magento
- https://magento.com/
version: 20.0.2
version: 20.0.3

View File

@@ -1,5 +1,5 @@
{{- if .Values.autoscaling.enabled }}
apiVersion: autoscaling/v2beta1
apiVersion: {{ include "common.capabilities.hpa.apiVersion" . }}
kind: HorizontalPodAutoscaler
metadata:
name: {{ template "common.names.fullname" . }}
@@ -23,12 +23,24 @@ spec:
- type: Resource
resource:
name: cpu
{{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }}
targetAverageUtilization: {{ .Values.autoscaling.targetCPU }}
{{- else }}
target:
type: Utilization
averageUtilization: {{ .Values.autoscaling.targetCPU }}
{{- end }}
{{- end }}
{{- if .Values.autoscaling.targetMemory }}
- type: Resource
resource:
name: memory
{{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }}
targetAverageUtilization: {{ .Values.autoscaling.targetMemory }}
{{- else }}
target:
type: Utilization
averageUtilization: {{ .Values.autoscaling.targetMemory }}
{{- end }}
{{- end }}
{{- end }}