unnested autoscaling

gsoft-inc · Dec 5, 2024 · d03b436 · d03b436
1 parent f642860
commit d03b436
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git a/charts/aspnetcore/templates/deployment-hpa.yaml b/charts/aspnetcore/templates/deployment-hpa.yaml
@@ -1,9 +1,9 @@
-{{- if (((.Values.deployment).autoscaling).enabled) }}
+{{- if ((.Values.autoscaling).enabled) }}
 apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
-  name: {{ .Release.Name }}-hpa
-  annotations:
+  name: {{ default (printf "%s-deployment" .Release.Name) .Values.autoscaling.name }}
+  labels:
     {{- with .Values.commonAnnotations }}
       {{- toYaml . | nindent 4 }}
     {{- end }}
@@ -12,11 +12,11 @@ spec:
     - resource:
         name: cpu
         target:
-          averageUtilization: {{ .Values.deployment.autoscaling.targetCPUUtilizationPercentage }}
+          averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
           type: Utilization
       type: Resource
-  minReplicas: {{ max (add ((.Values.podDisruptionBudget).minAvailable) 1) (.Values.deployment.autoscaling.minReplicas) }}
-  maxReplicas: {{ max (add ((.Values.podDisruptionBudget).minAvailable) 1) (.Values.deployment.autoscaling.minReplicas) (.Values.deployment.autoscaling.maxReplicas) }}
+  minReplicas: {{ max (add ((.Values.podDisruptionBudget).minAvailable) 1) (.Values.autoscaling.minReplicas) }}
+  maxReplicas: {{ max (add ((.Values.podDisruptionBudget).minAvailable) 1) (.Values.autoscaling.minReplicas) (.Values.autoscaling.maxReplicas) }}
   scaleTargetRef:
     apiVersion: apps/v1
     kind: Deployment

diff --git a/charts/aspnetcore/values.yaml b/charts/aspnetcore/values.yaml
@@ -66,19 +66,9 @@ ingress:
 
 ## ASP.NET Core deployment parameters
 ## @param deployment.name Name of the deployment, automatically generated from the release name if not specified
-## ref: https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/
-## @param deployment.autoscaling.enabled Default to false. Enable autoscaling
-## @param deployment.autoscaling.minReplicas Optional if PodDistributionBudget is set. Minimum number of ASP.NET Core replicas minimum is PodDisruptionBudget.minAvailable + 1
-## @param deployment.autoscaling.maxReplicas Optional if PodDistributionBudget is set or minReplicas is set. Maximum number of ASP.NET Core replicas minimum is minReplicas value.
-## @param deployment.autoscaling.targetCPUUtilizationPercentage Target CPU utilization percentage for autoscaling
 ##
 deployment:
   name: ""
-  autoscaling:
-    enabled: false
-    #minReplicas: 2
-    #maxReplicas: 3
-    targetCPUUtilizationPercentage: 80
 
 ## ASP.NET Core containers' resource requests and limits defined in YAML
 ## ref: https://kubernetes.io/docs/user-guide/compute-resources/
@@ -180,6 +170,19 @@ azureWorkloadIdentity:
 podDisruptionBudget:
   minAvailable: 1
 
+## Autoscaling deployment settings
+## ref: https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/
+## @param autoscaling.enabled Default to false. Enable autoscaling
+## @param autoscaling.minReplicas Optional if PodDistributionBudget is set. Minimum number of ASP.NET Core replicas minimum is PodDisruptionBudget.minAvailable + 1
+## @param autoscaling.maxReplicas Optional if PodDistributionBudget is set or minReplicas is set. Maximum number of ASP.NET Core replicas minimum is minReplicas value.
+## @param autoscaling.targetCPUUtilizationPercentage Target CPU utilization percentage for autoscaling
+autoscaling:
+  enabled: false
+  name: ""
+  minReplicas: 2
+  maxReplicas: 3
+  targetCPUUtilizationPercentage: 80
+
 ## @param extraVolumes Optionally specify extra list of additional volumes, e.g:
 ## extraVolumes:
 ##   - name: config-vol