From cfd9a7e3cde9b5f8537c87b39f97561a96a258d1 Mon Sep 17 00:00:00 2001 From: Marco Ebert Date: Mon, 5 Jun 2023 17:25:10 +0200 Subject: [PATCH] HPA: Partially revert #465. --- CHANGELOG.md | 1 + helm/ingress-nginx/templates/controller-hpa.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b91dd5d8..cac520b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ and this project's packages adheres to [Semantic Versioning](http://semver.org/s - PDB: Improve checks. ([#487](https://github.com/giantswarm/ingress-nginx-app/pull/487)) - Image: Update to [`v1.8.0`](https://github.com/kubernetes/ingress-nginx/blob/main/changelog/Changelog-1.8.0.md). ([#489](https://github.com/giantswarm/ingress-nginx-app/pull/489)) +- HPA: Partially revert [#465](https://github.com/giantswarm/ingress-nginx-app/pull/465). ([#493](https://github.com/giantswarm/ingress-nginx-app/pull/493)) ## [3.0.0-alpha1] - 2023-05-09 diff --git a/helm/ingress-nginx/templates/controller-hpa.yaml b/helm/ingress-nginx/templates/controller-hpa.yaml index 96a91f53..f212bc4f 100644 --- a/helm/ingress-nginx/templates/controller-hpa.yaml +++ b/helm/ingress-nginx/templates/controller-hpa.yaml @@ -21,18 +21,18 @@ spec: minReplicas: {{ .Values.controller.autoscaling.minReplicas }} maxReplicas: {{ .Values.controller.autoscaling.maxReplicas }} metrics: - {{- with .Values.controller.autoscaling.targetCPUUtilizationPercentage }} + {{- with .Values.controller.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: - name: cpu + name: memory target: type: Utilization averageUtilization: {{ . }} {{- end }} - {{- with .Values.controller.autoscaling.targetMemoryUtilizationPercentage }} + {{- with .Values.controller.autoscaling.targetCPUUtilizationPercentage }} - type: Resource resource: - name: memory + name: cpu target: type: Utilization averageUtilization: {{ . }}