Feature/enable autoscale (#15)

* add pod autoscale-support * bump version
Kurt108 · Nov 11, 2020 · 167cc47 · 167cc47
1 parent a26e1e9
commit 167cc47
Show file tree

Hide file tree

Showing 8 changed files with 83 additions and 4 deletions.
diff --git a/charts/gotenberg/Chart.yaml b/charts/gotenberg/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: "6.3.0"
 description: Gotenberg is a Docker-powered stateless API for converting HTML, Markdown and Office documents to PDF.
 name: gotenberg
 icon: https://user-images.githubusercontent.com/8983173/69229423-ac731300-0b85-11ea-8c2e-2cc00ecdb269.PNG
-version: 2.1.3
+version: 2.1.4
 home: https://thecodingmachine.github.io/gotenberg/
 sources:
   - https://github.com/thecodingmachine/gotenberg

diff --git a/charts/gotenberg/README.md b/charts/gotenberg/README.md
@@ -5,7 +5,7 @@
 =========
 Gotenberg is a Docker-powered stateless API for converting HTML, Markdown and Office documents to PDF.
 
-Current chart version is `2.1.3`
+Current chart version is `2.1.4`
 
 ## Installing the Chart
 
@@ -30,6 +30,10 @@ NAME: my-release
 |-----|------|---------|-------------|
 | affinity | object | `{}` |  |
 | annotations | object | `{}` |  |
+| autoscaling.enabled | bool | `false` |  |
+| autoscaling.maxReplicas | int | `1` |  |
+| autoscaling.minReplicas | int | `1` |  |
+| autoscaling.targetCPUUtilizationPercentage | int | `80` |  |
 | basicAuth.enabled | bool | `false` |  |
 | basicAuth.passwordMD5 | string | `"$apr1$zQ7F0fKS$X3aXkUCufHQlVe51VWUKu1"` |  |
 | basicAuth.username | string | `"convert"` |  |

diff --git a/charts/gotenberg/templates/hpa.yaml b/charts/gotenberg/templates/hpa.yaml
@@ -0,0 +1,29 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ include "gotenberg.fullname" . }}
+  labels:
+    app: {{ template "gotenberg.name" . }}
+    release: {{ .Release.Name }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ include "gotenberg.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 }}
diff --git a/charts/gotenberg/values.yaml b/charts/gotenberg/values.yaml
@@ -39,6 +39,13 @@ resources: {}
 #    cpu: 600m
 #    memory: 512Mi
 
+autoscaling:
+  enabled: false
+  minReplicas: 1
+  maxReplicas: 1
+  targetCPUUtilizationPercentage: 80
+
+
 nodeSelector: {}
 
 tolerations: []

diff --git a/charts/thumbor/Chart.yaml b/charts/thumbor/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: thumbor
 icon: https://camo.githubusercontent.com/8add159463b5ef31481d1e0cc9fb590cd662fe62/68747470733a2f2f73332e65752d776573742d322e616d617a6f6e6177732e636f6d2f6d696e696d616c2d636f6d706163742f696d616765732f6d632d7468756d626f722e706e67
-version: 1.0.5
+version: 1.0.6
 appVersion: "6.7.5"
 description: A chart containing Thumbor
 home: http://thumbor.org/

diff --git a/charts/thumbor/README.md b/charts/thumbor/README.md
@@ -5,7 +5,7 @@
 =======
 A chart containing Thumbor
 
-Current chart version is `1.0.5`
+Current chart version is `1.0.6`
 
 ## Based on
 
@@ -32,6 +32,10 @@ NAME: my-release
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
+| autoscaling.enabled | bool | `false` |  |
+| autoscaling.maxReplicas | int | `1` |  |
+| autoscaling.minReplicas | int | `1` |  |
+| autoscaling.targetCPUUtilizationPercentage | int | `80` |  |
 | auth.enabled | bool | `true` |  |
 | auth.password | string | `"$1$nwVVjM_Y$VeLOyr0CIIMXQajJL2pXT1"` |  |
 | auth.username | string | `"thumbor"` |  |

diff --git a/charts/thumbor/templates/hpa.yaml b/charts/thumbor/templates/hpa.yaml
@@ -0,0 +1,29 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ include "thumbor.fullname" . }}
+  labels:
+    app: {{ template "thumbor.name" . }}
+    release: {{ .Release.Name }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ include "thumbor.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 }}
diff --git a/charts/thumbor/values.yaml b/charts/thumbor/values.yaml
@@ -61,3 +61,9 @@ resources:
   requests:
     cpu: 1
     memory: 512Mi
+
+autoscaling:
+  enabled: false
+  minReplicas: 1
+  maxReplicas: 1
+  targetCPUUtilizationPercentage: 80