diff --git a/bitnami/contour/Chart.lock b/bitnami/contour/Chart.lock index 589b073ec7..331d944aab 100644 --- a/bitnami/contour/Chart.lock +++ b/bitnami/contour/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common repository: https://charts.bitnami.com/bitnami - version: 1.13.0 -digest: sha256:e83af41b39942278f8389623671732e624f28c6f1ad6ac2d937e210c5f354a18 -generated: "2022-03-26T14:52:00.297394534Z" + version: 1.14.0 +digest: sha256:965d4465e4039d36637175307a8edfc13a53414d3bb698c0d26c8acc1cf3ec3d +generated: "2022-05-13T15:00:22.95998+02:00" diff --git a/bitnami/contour/Chart.yaml b/bitnami/contour/Chart.yaml index 7b2c5ae5de..4d530d8d37 100644 --- a/bitnami/contour/Chart.yaml +++ b/bitnami/contour/Chart.yaml @@ -27,4 +27,4 @@ sources: - https://github.com/envoyproxy/envoy - https://github.com/bitnami/bitnami-docker-contour - https://projectcontour.io -version: 7.8.1 +version: 7.8.2 diff --git a/bitnami/contour/templates/envoy/hpa.yaml b/bitnami/contour/templates/envoy/hpa.yaml index 592c91867d..a2903d9f43 100644 --- a/bitnami/contour/templates/envoy/hpa.yaml +++ b/bitnami/contour/templates/envoy/hpa.yaml @@ -1,5 +1,5 @@ {{- if and .Values.envoy.enabled .Values.envoy.autoscaling.enabled (eq .Values.envoy.kind "deployment") }} -apiVersion: autoscaling/v2beta1 +apiVersion: {{ include "common.capabilities.hpa.apiVersion" . }} kind: HorizontalPodAutoscaler metadata: name: {{ include "common.names.fullname" . }}-envoy @@ -24,12 +24,24 @@ spec: - type: Resource resource: name: cpu + {{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }} targetAverageUtilization: {{ .Values.envoy.autoscaling.targetCPU }} + {{- else }} + target: + type: Utilization + averageUtilization: {{ .Values.envoy.autoscaling.targetCPU }} + {{- end }} {{- end }} {{- if .Values.envoy.autoscaling.targetMemory }} - type: Resource resource: name: memory + {{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }} targetAverageUtilization: {{ .Values.envoy.autoscaling.targetMemory }} + {{- else }} + target: + type: Utilization + averageUtilization: {{ .Values.envoy.autoscaling.targetMemory }} + {{- end }} {{- end }} {{- end }}