From 82dc8be9c18050dc33d243217ecf4ff611159d30 Mon Sep 17 00:00:00 2001
From: "J.G" <28401385+paxconG14@users.noreply.github.com>
Date: Mon, 13 Nov 2023 15:23:05 +0100
Subject: [PATCH] Small corrections... - HPA API update - volumne mount path
 for license key - license key configMap name

---
 microservicesruntime/helm/templates/_helpers.tpl    |  2 +-
 microservicesruntime/helm/templates/deployment.yaml |  2 +-
 microservicesruntime/helm/templates/hpa.yaml        | 10 +++++++---
 mywebmethodsserver/helm/templates/hpa.yaml          | 10 +++++++---
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/microservicesruntime/helm/templates/_helpers.tpl b/microservicesruntime/helm/templates/_helpers.tpl
index 37dd3ac..c13605b 100644
--- a/microservicesruntime/helm/templates/_helpers.tpl
+++ b/microservicesruntime/helm/templates/_helpers.tpl
@@ -83,5 +83,5 @@ Create the name of the service account to use
 Create the name of the license config map
 */}}
 {{- define "microservicesruntime.licenseConfigMapName" -}}
-{{- default ( printf "%s-%s" (include "common.names.fullname" .) "-license") .Values.licenseConfigMap }}
+{{- default ( printf "%s-%s" (include "common.names.fullname" .) "-license") .Values.microservicesruntime.licenseConfigMap }}
 {{- end }}
diff --git a/microservicesruntime/helm/templates/deployment.yaml b/microservicesruntime/helm/templates/deployment.yaml
index 1daac75..081cb33 100644
--- a/microservicesruntime/helm/templates/deployment.yaml
+++ b/microservicesruntime/helm/templates/deployment.yaml
@@ -127,7 +127,7 @@ spec:
             {{- toYaml .Values.resources.msrContainer | nindent 12 }}
           volumeMounts:
             - name: microservicesruntime-license
-              mountPath: {{ .Values.microservicesruntime.installDir }}/config/licenseKey.xml
+              mountPath: {{ .Values.microservicesruntime.installDir }}/licenseKey.xml
               subPath:   licenseKey.xml
               readOnly:  true
             - name: application-properties
diff --git a/microservicesruntime/helm/templates/hpa.yaml b/microservicesruntime/helm/templates/hpa.yaml
index fdec630..65cd444 100644
--- a/microservicesruntime/helm/templates/hpa.yaml
+++ b/microservicesruntime/helm/templates/hpa.yaml
@@ -18,7 +18,7 @@
 #  */
 
 {{- if .Values.autoscaling.enabled }}
-apiVersion: autoscaling/v2beta1
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "common.names.fullname" . }}
@@ -39,12 +39,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 }}
diff --git a/mywebmethodsserver/helm/templates/hpa.yaml b/mywebmethodsserver/helm/templates/hpa.yaml
index ff8ddd0..96f6048 100644
--- a/mywebmethodsserver/helm/templates/hpa.yaml
+++ b/mywebmethodsserver/helm/templates/hpa.yaml
@@ -17,7 +17,7 @@
 #  *
 #  */
 {{- if .Values.autoscaling.enabled }}
-apiVersion: autoscaling/v2beta1
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "common.names.fullname" . }}
@@ -38,12 +38,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 }}