Merge pull request #26 from elastiflow/improve-autoscaling

Improve Autoscaling
elastiflow · Jul 3, 2024 · b7df7a7 · b7df7a7
2 parents fc15e53 + 2be1baa
commit b7df7a7
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 19 deletions.
diff --git a/charts/netobserv/Chart.yaml b/charts/netobserv/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: netobserv
 description: ElastiFlow NetObserv
 type: application
-version: 0.3.1
+version: 0.4.0
 appVersion: 7.0.1
 
 keywords:

diff --git a/charts/netobserv/templates/hpa.yaml b/charts/netobserv/templates/hpa.yaml
@@ -12,21 +12,12 @@ spec:
     name: {{ include "netobserv.fullname" . }}
   minReplicas: {{ .Values.autoscaling.minReplicas }}
   maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  {{- with .Values.autoscaling.metrics }}
   metrics:
-    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: cpu
-        target:
-          type: Utilization
-          averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
-    {{- end }}
-    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: memory
-        target:
-          type: Utilization
-          averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    {{- end }}
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.autoscaling.behavior }}
+  behavior:
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
 {{- end }}
diff --git a/charts/netobserv/templates/service.yaml b/charts/netobserv/templates/service.yaml
@@ -10,6 +10,15 @@ spec:
   {{- if .Values.service.externalTrafficPolicy }}
   externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
   {{- end }}
+  {{- if .Values.service.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+  {{- range .Values.service.loadBalancerSourceRanges }}
+    - {{ . }}
+  {{- end }}
+  {{- end }}
+  {{- if .Values.service.loadBalancerIP }}
+  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
+  {{- end }}
   ports: {{ .Values.service.ports | toYaml | nindent 4 }}
   selector:
     {{- include "netobserv.selectorLabels" . | nindent 4 }}
diff --git a/charts/netobserv/values.yaml b/charts/netobserv/values.yaml
@@ -238,8 +238,28 @@ autoscaling:
   enabled: false
   minReplicas: 1
   maxReplicas: 100
-  targetCPUUtilizationPercentage: 80
-  # targetMemoryUtilizationPercentage: 80
+  metrics:
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: 80
+    # - type: Resource
+    #   resource:
+    #     name: memory
+    #     targetAverageUtilization: 80
+  # behavior:
+  #   scaleUp:
+  #     stabilizationWindowSeconds: 300
+  #     policies:
+  #       - type: Percent
+  #         value: 100
+  #         periodSeconds: 15
+  #   scaleDown:
+  #     stabilizationWindowSeconds: 300
+  #     policies:
+  #       - type: Percent
+  #         value: 10
+  #         periodSeconds: 15
 
 tolerations: []