Merge pull request #3 from paxconG14/main

Small corrections...
SoftwareAG · Nov 21, 2023 · 0c4acf1 · 0c4acf1
2 parents 218bae6 + 82dc8be
commit 0c4acf1
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 }}