From 27ffeeb18f73bbde1b66866e796714308cebf1f4 Mon Sep 17 00:00:00 2001
From: Sjouke de Vries <sjoukedevries@live.nl>
Date: Sun, 4 Dec 2022 20:35:56 +0100
Subject: [PATCH] fix(hpa): deprecated api version, bump to v2 (#9348)

* fix(hpa): deprecated api version, bump to v2

* chore(hpa): abstract hpa apiVersion to helm value

* feat(hpa): add controller.autoscaling.apiVersion docs in README

* docs(hpa): quotes around apiVersion string type

* chore(hpa): run helm-docs in repo

* chore(hpa): remove local helm-docs module install and output

* docs(helm): add hpa controller.autoscaling.apiVersion description

* docs(hpa): remove autoscaling.apiVersion description as it fails ci
---
 charts/ingress-nginx/README.md                     | 1 +
 charts/ingress-nginx/templates/controller-hpa.yaml | 2 +-
 charts/ingress-nginx/values.yaml                   | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/charts/ingress-nginx/README.md b/charts/ingress-nginx/README.md
index 5922884cd..5ddd046ea 100644
--- a/charts/ingress-nginx/README.md
+++ b/charts/ingress-nginx/README.md
@@ -277,6 +277,7 @@ Kubernetes: `>=1.20.0-0`
 | controller.affinity | object | `{}` | Affinity and anti-affinity rules for server scheduling to nodes # Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity # |
 | controller.allowSnippetAnnotations | bool | `true` | This configuration defines if Ingress Controller should allow users to set their own *-snippet annotations, otherwise this is forbidden / dropped when users add those annotations. Global snippets in ConfigMap are still respected |
 | controller.annotations | object | `{}` | Annotations to be added to the controller Deployment or DaemonSet # |
+| controller.autoscaling.apiVersion | string | `"autoscaling/v2"` |  |
 | controller.autoscaling.behavior | object | `{}` |  |
 | controller.autoscaling.enabled | bool | `false` |  |
 | controller.autoscaling.maxReplicas | int | `11` |  |
diff --git a/charts/ingress-nginx/templates/controller-hpa.yaml b/charts/ingress-nginx/templates/controller-hpa.yaml
index e0979f14b..d1e78bdfc 100644
--- a/charts/ingress-nginx/templates/controller-hpa.yaml
+++ b/charts/ingress-nginx/templates/controller-hpa.yaml
@@ -1,7 +1,7 @@
 {{- if and .Values.controller.autoscaling.enabled (or (eq .Values.controller.kind "Deployment") (eq .Values.controller.kind "Both")) -}}
 {{- if not .Values.controller.keda.enabled }}
 
-apiVersion: autoscaling/v2beta2
+apiVersion: {{ .Values.controller.autoscaling.apiVersion }}
 kind: HorizontalPodAutoscaler
 metadata:
   annotations:
diff --git a/charts/ingress-nginx/values.yaml b/charts/ingress-nginx/values.yaml
index 35f922f6b..f80095c56 100644
--- a/charts/ingress-nginx/values.yaml
+++ b/charts/ingress-nginx/values.yaml
@@ -364,6 +364,7 @@ controller:
 
   # Mutually exclusive with keda autoscaling
   autoscaling:
+    apiVersion: autoscaling/v2
     enabled: false
     minReplicas: 1
     maxReplicas: 11