From e207d380d0ba303bc8047547e771f0732d8f0f51 Mon Sep 17 00:00:00 2001
From: slavogiez <stephane.lavogiez@ext.leroymerlin.fr>
Date: Tue, 14 Feb 2023 11:40:20 +0100
Subject: [PATCH 1/2] fix(hpa) properly detect hpa capabilities

---
 charts/kong/templates/_helpers.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/kong/templates/_helpers.tpl b/charts/kong/templates/_helpers.tpl
index 6f0ef69a0..9809fc8bb 100644
--- a/charts/kong/templates/_helpers.tpl
+++ b/charts/kong/templates/_helpers.tpl
@@ -1398,9 +1398,9 @@ extensions/v1beta1
 {{- end -}}
 
 {{- define "kong.autoscalingVersion" -}}
-{{- if (.Capabilities.APIVersions.Has "autoscaling/v2") -}}
+{{- if (.Capabilities.APIVersions.Has "autoscaling/v2/HorizontalPodAutoscaler") -}}
 autoscaling/v2
-{{- else if (.Capabilities.APIVersions.Has "autoscaling/v2beta2") -}}
+{{- else if (.Capabilities.APIVersions.Has "autoscaling/v2beta2/HorizontalPodAutoscaler") -}}
 autoscaling/v2beta2
 {{- else -}}
 autoscaling/v1

From f6f27562cf861ab8de733ae6a63180d51d11feb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Grzegorz=20Burzy=C5=84ski?= <czeslavo@gmail.com>
Date: Tue, 14 Feb 2023 13:51:07 +0100
Subject: [PATCH 2/2] changelog and release

---
 charts/kong/CHANGELOG.md | 9 +++++++++
 charts/kong/Chart.yaml   | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/charts/kong/CHANGELOG.md b/charts/kong/CHANGELOG.md
index 0689eb82a..7edb08e5b 100644
--- a/charts/kong/CHANGELOG.md
+++ b/charts/kong/CHANGELOG.md
@@ -1,7 +1,16 @@
 # Changelog
 
+## 2.16.4
+
+### Fixed
+
+* HorizontalPodAutoscaler's API version is detected properly.
+  [#744](https://github.com/Kong/charts/pull/744)
+
 ## 2.16.3
 
+### Fixed
+
 * Fix template issue preventing custom dblessconfig volume from being mounted.
   [#741](https://github.com/Kong/charts/pull/741)
 
diff --git a/charts/kong/Chart.yaml b/charts/kong/Chart.yaml
index d238eb69e..b0f824d96 100644
--- a/charts/kong/Chart.yaml
+++ b/charts/kong/Chart.yaml
@@ -11,7 +11,7 @@ maintainers:
 name: kong
 sources:
 - https://github.com/Kong/charts/tree/main/charts/kong
-version: 2.16.3
+version: 2.16.4
 appVersion: "3.1"
 dependencies:
 - name: postgresql