From a23db4997cfe31d003e7c154ce00da983d6cded1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?=
 =?UTF-8?q?=D0=9A=D0=BE=D1=81=D1=82=D1=8B=D1=80=D0=B5=D0=B2?=
 <kostyrev@users.noreply.github.com>
Date: Mon, 29 Jan 2018 23:27:33 +0300
Subject: [PATCH] [stable/nginx-ingress] Use autoscaling/v1 for hpa (#3418)

---
 stable/nginx-ingress/Chart.yaml                    | 2 +-
 stable/nginx-ingress/templates/controller-hpa.yaml | 8 ++------
 stable/nginx-ingress/values.yaml                   | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/stable/nginx-ingress/Chart.yaml b/stable/nginx-ingress/Chart.yaml
index 1b9558d874..9fcfa0ade2 100755
--- a/stable/nginx-ingress/Chart.yaml
+++ b/stable/nginx-ingress/Chart.yaml
@@ -1,5 +1,5 @@
 name: nginx-ingress
-version: 0.9.0
+version: 0.9.1
 appVersion: 0.10.2
 description: An nginx Ingress controller that uses ConfigMap to store the nginx configuration.
 icon: https://upload.wikimedia.org/wikipedia/commons/thumb/c/c5/Nginx_logo.svg/500px-Nginx_logo.svg.png
diff --git a/stable/nginx-ingress/templates/controller-hpa.yaml b/stable/nginx-ingress/templates/controller-hpa.yaml
index 203d2986ed..422d846f3b 100644
--- a/stable/nginx-ingress/templates/controller-hpa.yaml
+++ b/stable/nginx-ingress/templates/controller-hpa.yaml
@@ -1,6 +1,6 @@
 {{- if eq .Values.controller.kind "Deployment" }}
 {{- if .Values.controller.autoscaling.enabled }}
-apiVersion: autoscaling/v2beta1
+apiVersion: autoscaling/v1
 kind: HorizontalPodAutoscaler
 metadata:
   labels:
@@ -17,10 +17,6 @@ spec:
     name: {{ template "nginx-ingress.controller.fullname" . }}
   minReplicas: {{ .Values.controller.autoscaling.minReplicas }}
   maxReplicas: {{ .Values.controller.autoscaling.maxReplicas }}
-  metrics:
-  - type: Resource
-    resource:
-      name: cpu
-      targetAverageUtilization: {{ .Values.controller.autoscaling.targetAverageUtilization }}
+  targetCPUUtilizationPercentage: {{ .Values.controller.autoscaling.targetCPUUtilizationPercentage }}
 {{- end }}
 {{- end }}
diff --git a/stable/nginx-ingress/values.yaml b/stable/nginx-ingress/values.yaml
index eab22e0353..a0cd7637a9 100644
--- a/stable/nginx-ingress/values.yaml
+++ b/stable/nginx-ingress/values.yaml
@@ -111,7 +111,7 @@ controller:
     enabled: false
   #  minReplicas: 1
   #  maxReplicas: 11
-  #  targetAverageUtilization: 50
+  #  targetCPUUtilizationPercentage: 50
 
   ## Override NGINX template
   customTemplate: