From 131fcbfc4ff3f438751abd7b29db02c349eb3fc0 Mon Sep 17 00:00:00 2001
From: blakefaulds <blake.faulds@gmail.com>
Date: Tue, 5 Sep 2023 11:26:18 +0200
Subject: [PATCH 1/2] Remove depracated API endpoint

Ref. CINF-2165

PoddistributionBudget
HorizontalPodAutoscaler
---
 .../istio-control/istio-discovery/templates/autoscale.yaml    | 4 +++-
 .../istio-discovery/templates/poddisruptionbudget.yaml        | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/manifests/charts/istio-control/istio-discovery/templates/autoscale.yaml b/manifests/charts/istio-control/istio-discovery/templates/autoscale.yaml
index b8b14ad0ba56..997bbf4967c4 100644
--- a/manifests/charts/istio-control/istio-discovery/templates/autoscale.yaml
+++ b/manifests/charts/istio-control/istio-discovery/templates/autoscale.yaml
@@ -21,6 +21,8 @@ spec:
   - type: Resource
     resource:
       name: cpu
-      targetAverageUtilization: {{ .Values.pilot.cpu.targetAverageUtilization }}
+      target: 
+          averageUtilization: {{ .Values.pilot.cpu.targetAverageUtilization }}
+          type: Utilization
 ---
 {{- end }}
diff --git a/manifests/charts/istio-control/istio-discovery/templates/poddisruptionbudget.yaml b/manifests/charts/istio-control/istio-discovery/templates/poddisruptionbudget.yaml
index 40b2e6015415..8a938ff479ff 100644
--- a/manifests/charts/istio-control/istio-discovery/templates/poddisruptionbudget.yaml
+++ b/manifests/charts/istio-control/istio-discovery/templates/poddisruptionbudget.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.global.defaultPodDisruptionBudget.enabled }}
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: istiod{{- if not (eq .Values.revision "") }}-{{ .Values.revision }}{{- end }}

From ce2dfebe95402f08b86a5aa39ece92dccdf9d355 Mon Sep 17 00:00:00 2001
From: blakefaulds <blake.faulds@gmail.com>
Date: Mon, 25 Sep 2023 17:23:03 +0200
Subject: [PATCH 2/2] update HPA

hpa endpoint updated
removed incorrect spaces
---
 .../istio-control/istio-discovery/templates/autoscale.yaml  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/charts/istio-control/istio-discovery/templates/autoscale.yaml b/manifests/charts/istio-control/istio-discovery/templates/autoscale.yaml
index 997bbf4967c4..f6cf7ef296fe 100644
--- a/manifests/charts/istio-control/istio-discovery/templates/autoscale.yaml
+++ b/manifests/charts/istio-control/istio-discovery/templates/autoscale.yaml
@@ -1,5 +1,5 @@
 {{- if and .Values.pilot.autoscaleEnabled .Values.pilot.autoscaleMin .Values.pilot.autoscaleMax }}
-apiVersion: autoscaling/v2beta1
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: istiod{{- if not (eq .Values.revision "") }}-{{ .Values.revision }}{{- end }}
@@ -22,7 +22,7 @@ spec:
     resource:
       name: cpu
       target: 
-          averageUtilization: {{ .Values.pilot.cpu.targetAverageUtilization }}
-          type: Utilization
+        averageUtilization: {{ .Values.pilot.cpu.targetAverageUtilization }}
+        type: Utilization
 ---
 {{- end }}