Fix the _hpa.tpl so it produses a valid HorizontalPodAutoscaler

dotnet/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
 description: .NET Core Helm Chart
 name: dotnet
-version: 13.0.0
+version: 13.0.1
 dependencies:
   - name: libchart
-    version: 4.0.0
+    version: 4.0.1
     repository: file://../libchart

golang/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
 description: golan Helm Chart
 name: golang
-version: 17.0.0
+version: 17.0.1
 dependencies:
   - name: libchart
-    version: 4.0.0
+    version: 4.0.1
     repository: file://../libchart

java/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
 description: Java Helm Chart
 name: java
-version: 10.0.0
+version: 10.0.1
 dependencies:
   - name: libchart
-    version: 4.0.0
+    version: 4.0.1
     repository: file://../libchart

java/values.yaml

@@ -197,8 +197,5 @@ volumes: []
 
 deployKind: deployment
 
-autoscaling:
-  enabled: false
-
 # https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/
 dnsConfig: {}

libchart/Chart.yaml

@@ -15,7 +15,7 @@ type: library
 # 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: 4.0.0
+version: 4.0.1
 
 # 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

libchart/templates/_hpa.tpl

@@ -6,23 +6,27 @@ metadata:
   labels:
     {{- include "libchart.labels" . | nindent 4 }}
 spec:
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+  {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+  - resource:
+      name: cpu
+      target:
+        averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+        type: Utilization
+    type: Resource
+  {{- end }}
+  {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+  - resource:
+      name: memory
+      target:
+        averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+        type: Utilization
+    type: Resource
+  {{- end }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
   scaleTargetRef:
     apiVersion: apps/v1
     kind: Deployment
     name: {{ include "libchart.fullname" . }}
-  minReplicas: {{ .Values.autoscaling.minReplicas }}
-  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
-  metrics:
-    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: cpu
-        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
-    {{- end }}
-    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: memory
-        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    {{- end }}
-{{- end }}
+{{- end }}

nodejs/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
 description: Node.js Helm Chart
 name: nodejs
-version: 17.0.0
+version: 17.0.1
 dependencies:
   - name: libchart
-    version: 4.0.0
+    version: 4.0.1
     repository: file://../libchart

web/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 appVersion: "1.0"
 description: Helm chart for deployment of web servers
 name: web
-version: 14.0.0
+version: 14.0.1
 dependencies:
   - name: libchart
-    version: 4.0.0
+    version: 4.0.1
     repository: file://../libchart