From d96bd3e85c911b0d9131463b363cd0ce3b83134c Mon Sep 17 00:00:00 2001
From: Tricentis <b.yang@tricentis.com>
Date: Wed, 8 Nov 2023 18:37:49 +0000
Subject: [PATCH 1/2] Update from Tricentis-qTest/qtest-chart

---
 Charts/qtest-session/Chart.yaml             |  4 ++--
 Charts/qtest-session/templates/hpa.yaml     | 22 ++++++++++++++-------
 Charts/qtest-session/templates/service.yaml |  4 ++++
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/Charts/qtest-session/Chart.yaml b/Charts/qtest-session/Chart.yaml
index b1cb155d..28f3cd28 100644
--- a/Charts/qtest-session/Chart.yaml
+++ b/Charts/qtest-session/Chart.yaml
@@ -29,9 +29,9 @@ kubeVersion: ">=1.18.0-0"
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.1.10
+version: 1.1.11
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "2023.5"
+appVersion: 2023.5
diff --git a/Charts/qtest-session/templates/hpa.yaml b/Charts/qtest-session/templates/hpa.yaml
index 7f9810a0..448aefa2 100644
--- a/Charts/qtest-session/templates/hpa.yaml
+++ b/Charts/qtest-session/templates/hpa.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.autoscaling.enabled }}
 {{- if .Values.rollouts.enabled -}}
-apiVersion: autoscaling/v2beta1
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "qtest-session.fullname" . }}
@@ -19,16 +19,21 @@ spec:
     - type: Resource
       resource:
         name: cpu
-        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
     {{- end }}
     {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
     - type: Resource
       resource:
         name: memory
-        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
     {{- end }}
+{{- end }}
 {{- else }}
-apiVersion: autoscaling/v2beta1
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "qtest-session.fullname" . }}
@@ -47,13 +52,16 @@ spec:
     - type: Resource
       resource:
         name: cpu
-        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
     {{- end }}
     {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
     - type: Resource
       resource:
         name: memory
-        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
     {{- end }}
-{{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/Charts/qtest-session/templates/service.yaml b/Charts/qtest-session/templates/service.yaml
index 04f0ac85..ec6f48e7 100644
--- a/Charts/qtest-session/templates/service.yaml
+++ b/Charts/qtest-session/templates/service.yaml
@@ -35,6 +35,10 @@ kind: Service
 metadata:
   name: {{ .Values.service.serviceName }}-canary
   namespace: {{ .Values.namespace.name }}
+  {{- with .Values.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     app: qtest-session
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"

From ae1a44a3d38fed51a5c15752ab8ab3f6b570de81 Mon Sep 17 00:00:00 2001
From: Brandon <77506625+byangtri@users.noreply.github.com>
Date: Wed, 8 Nov 2023 13:38:39 -0500
Subject: [PATCH 2/2] Update Chart.yaml

---
 Charts/qtest-session/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Charts/qtest-session/Chart.yaml b/Charts/qtest-session/Chart.yaml
index 28f3cd28..3bbe5f80 100644
--- a/Charts/qtest-session/Chart.yaml
+++ b/Charts/qtest-session/Chart.yaml
@@ -34,4 +34,4 @@ version: 1.1.11
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: 2023.5
+appVersion: "2023.5"