fix: fix autoscaling version detection (Kong#752)

Nirmal-2204 · Feb 16, 2023 · 5bbe4fc · 5bbe4fc
1 parent d531d8f
commit 5bbe4fc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/charts/kong/CHANGELOG.md b/charts/kong/CHANGELOG.md
@@ -1,7 +1,9 @@
 # Changelog
 
-## Unreleased
+## 2.16.5
 
+* Fix autoscaling version detection.
+  [#744](https://github.com/Kong/charts/pull/744)
 * Don't include a clear-stale-pid initContainer when kong gateway is not
   enabled in the deployment.
   [#744](https://github.com/Kong/charts/pull/744)

diff --git 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.4
+version: 2.16.5
 appVersion: "3.1"
 dependencies:
 - name: postgresql

diff --git a/charts/kong/templates/hpa.yaml b/charts/kong/templates/hpa.yaml
@@ -17,10 +17,10 @@ spec:
   behavior:
     {{- toYaml .Values.autoscaling.behavior | nindent 4 }}
   {{- end }}
-  {{- if not (.Capabilities.APIVersions.Has "autoscaling/v2beta2") }}
-  targetCPUUtilizationPercentage: {{ .Values.autoscaling.targetCPUUtilizationPercentage | default 80 }}
-  {{- else }}
+  {{- if contains "autoscaling/v2" (include "kong.autoscalingVersion" . ) }}
   metrics:
     {{- toYaml .Values.autoscaling.metrics | nindent 4 }}
+  {{- else }}
+  targetCPUUtilizationPercentage: {{ .Values.autoscaling.targetCPUUtilizationPercentage | default 80 }}
   {{- end }}
 {{- end }}