FEATURE/MINOR: haproxy: Add HPA Keda, improvements ServiceMonitor/deployment (#142)

* add HPA keda
* add interval: 30s

Co-authored-by: serhii.hondaruk <[email protected]>

Author: Infusible

haproxy/templates/deployment.yaml

@@ -26,7 +26,7 @@ metadata:
 {{ toYaml .Values.podAnnotations | indent 4 }}
   {{- end }}
 spec:
-  {{- if not .Values.autoscaling.enabled }}
+  {{- if and (not .Values.autoscaling.enabled) (not .Values.keda.enabled) }}
   replicas: {{ .Values.replicaCount }}
   {{- end }}
   selector:

haproxy/templates/hpa.yaml

@@ -14,7 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if .Values.autoscaling.enabled }}
+{{- if and (eq .Values.kind "Deployment") .Values.autoscaling.enabled }}
+{{- if not .Values.keda.enabled }}
 apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
 metadata:
@@ -45,3 +46,4 @@ spec:
     {{- toYaml . | trim | nindent 4 }}
   {{- end }}
 {{- end }}
+{{- end }}

haproxy/templates/keda.yaml

@@ -0,0 +1,49 @@
+{{/*
+Copyright 2021 HAProxy Technologies LLC
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/}}
+
+{{- if and (eq .Values.kind "Deployment") .Values.keda.enabled }}
+apiVersion: keda.sh/v1alpha1
+kind: ScaledObject
+metadata:
+  name: {{ include "haproxy.fullname" . }}
+  labels:
+    {{- include "haproxy.labels" . | nindent 4 }}
+  {{- if .Values.keda.scaledObject.annotations }}
+  annotations: {{ toYaml .Values.keda.scaledObject.annotations | nindent 4 }}
+  {{- end }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ include "haproxy.fullname" . }}
+  pollingInterval: {{ .Values.keda.pollingInterval }}
+  cooldownPeriod: {{ .Values.keda.cooldownPeriod }}
+  minReplicaCount: {{ .Values.keda.minReplicas }}
+  maxReplicaCount: {{ .Values.keda.maxReplicas }}
+  triggers:
+{{- with .Values.keda.triggers }}
+{{ toYaml . | indent 2 }}
+{{ end }}
+  advanced:
+    restoreToOriginalReplicaCount: {{ .Values.keda.restoreToOriginalReplicaCount }}
+{{- if .Values.keda.behavior }}
+    horizontalPodAutoscalerConfig:
+      behavior:
+{{ with .Values.keda.behavior -}}
+{{ toYaml . | indent 8 }}
+{{ end }}
+{{- end }}
+{{- end }}

haproxy/values.yaml

@@ -388,6 +388,30 @@ autoscaling:
   #         type: Value
   #         value: 10k
 
+keda:
+  enabled: false
+  minReplicas: 2
+  maxReplicas: 20
+  pollingInterval: 30
+  cooldownPeriod: 300
+  restoreToOriginalReplicaCount: false
+  scaledObject:
+    annotations: {}
+  behavior: {}
+  #  scaleDown:
+  #    stabilizationWindowSeconds: 300
+  #    policies:
+  #    - type: Percent
+  #      value: 100
+  #      periodSeconds: 15
+  triggers: []
+  #  - type: prometheus
+  #    metadata:
+  #      serverAddress: http://<prometheus-host>:9090
+  #      metricName: haproxy_process_idle_time_percent
+  #      threshold: '50'
+  #      query: avg(100-avg_over_time(haproxy_process_idle_time_percent{container="kubernetes-ingress-controller",service="mytest-kubernetes-ingress"}[2m]))
+
 ## Pod Disruption Budget
 ## Only to be used with Deployment kind
 ## ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/
@@ -435,9 +459,10 @@ serviceMonitor:
   ## Specify the endpoints
   ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/design.md#servicemonitor
   endpoints:
-  - port: prometheus
-    path: /metrics
-    scheme: http
+    - port: prometheus
+      path: /metrics
+      scheme: http
+      interval: 30s
 
 ## Configure Ingress
 ## ref: https://kubernetes.io/docs/concepts/services-networking/ingress/

kubernetes-ingress/values.yaml

@@ -216,7 +216,7 @@ controller:
     restoreToOriginalReplicaCount: false
     scaledObject:
       annotations: {}
-    behaviour: {}
+    behavior: {}
     #  scaleDown:
     #    stabilizationWindowSeconds: 300
     #    policies:
@@ -482,9 +482,10 @@ controller:
     ## Specify the endpoints
     ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/design.md#servicemonitor
     endpoints:
-    - port: stat
-      path: /metrics
-      scheme: http
+      - port: stat
+        path: /metrics
+        scheme: http
+        interval: 30s
 
 ## Default 404 backend
 defaultBackend: