From 7bc88cba1e56a358c2e4817507d93c32210b8187 Mon Sep 17 00:00:00 2001
From: Ben Jackson <shreddedbacon@users.noreply.github.com>
Date: Sat, 16 Dec 2023 13:01:59 +1100
Subject: [PATCH] chore: bump version of aergia and add metrics (#50)

---
 charts/aergia/Chart.yaml                    | 19 ++++++++-----------
 charts/aergia/ci/linter-values.yaml         |  3 +++
 charts/aergia/templates/deployment.yaml     |  2 ++
 charts/aergia/templates/service.yaml        | 20 +++++++++++++++++++-
 charts/aergia/templates/servicemonitor.yaml | 19 +++++++++++++++++--
 charts/aergia/values.yaml                   |  4 ++++
 6 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/charts/aergia/Chart.yaml b/charts/aergia/Chart.yaml
index 56c3eee..761d684 100644
--- a/charts/aergia/Chart.yaml
+++ b/charts/aergia/Chart.yaml
@@ -1,26 +1,23 @@
 apiVersion: v2
 name: aergia
-description:
-  A Helm chart for Kubernetes which installs Aergia, a controller that allows simple scaling from and to zero.
+description: A Helm chart for Kubernetes which installs Aergia, a controller that allows simple scaling from and to zero.
 home: https://github.com/amazeeio/charts
 icon: https://raw.githubusercontent.com/amazeeio/charts/main/icon.png
 maintainers:
-- name: shreddedbacon
-  email: ben.jackson@amazee.io
-  url: https://amazee.io
+  - name: shreddedbacon
+    email: ben.jackson@amazee.io
+    url: https://amazee.io
 kubeVersion: ">= 1.23.0-0"
 
 type: application
 
-version: 0.5.0
+version: 0.5.1
 
-appVersion: v0.3.0
+appVersion: v0.3.1
 
 annotations:
   artifacthub.io/changes: |
     - kind: changed
-      description: update aergia-controller appVersion to v0.3.0
+      description: update aergia-controller appVersion to v0.3.1
     - kind: changed
-      description: added configmap for setting ip and useragent allow and block lists
-    - kind: changed
-      description: minimum kubernetes version to 1.23.0
+      description: added metrics endpoint
diff --git a/charts/aergia/ci/linter-values.yaml b/charts/aergia/ci/linter-values.yaml
index 5865a8c..a5ca0a7 100644
--- a/charts/aergia/ci/linter-values.yaml
+++ b/charts/aergia/ci/linter-values.yaml
@@ -20,3 +20,6 @@ customSelectors:
     clideployments: abc
 templates:
   enabled: true
+
+metrics:
+  enabled: false
diff --git a/charts/aergia/templates/deployment.yaml b/charts/aergia/templates/deployment.yaml
index 3015ae9..5737847 100644
--- a/charts/aergia/templates/deployment.yaml
+++ b/charts/aergia/templates/deployment.yaml
@@ -98,6 +98,8 @@ spec:
           ports:
             - containerPort: 5000
               name: backend
+            - containerPort: 9912
+              name: metrics
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:
diff --git a/charts/aergia/templates/service.yaml b/charts/aergia/templates/service.yaml
index 6af91f3..9b3d67a 100644
--- a/charts/aergia/templates/service.yaml
+++ b/charts/aergia/templates/service.yaml
@@ -29,4 +29,22 @@ spec:
       protocol: TCP
       name: backend
   selector:
-    {{- include "aergia.selectorLabels" . | nindent 4 }}
\ No newline at end of file
+    {{- include "aergia.selectorLabels" . | nindent 4 }}
+{{- if .Values.metrics.enabled }}
+---
+kind: Service
+apiVersion: v1
+metadata:
+  name: {{ include "aergia.fullname" . }}-metrics
+  labels:
+    {{- include "aergia.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.backend.service.type }}
+  ports:
+    - name: metrics
+      protocol: TCP
+      port: 9912
+      targetPort: metrics
+  selector:
+    {{- include "aergia.selectorLabels" . | nindent 4 }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/aergia/templates/servicemonitor.yaml b/charts/aergia/templates/servicemonitor.yaml
index 232b125..ff688c3 100644
--- a/charts/aergia/templates/servicemonitor.yaml
+++ b/charts/aergia/templates/servicemonitor.yaml
@@ -1,5 +1,20 @@
-
+{{- if .Values.metrics.enabled }}
+kind: ServiceMonitor
+apiVersion: monitoring.coreos.com/v1
+metadata:
+  name: {{ include "aergia.fullname" . }}-metrics
+  labels:
+    {{- include "aergia.labels" . | nindent 4 }}
+spec:
+  endpoints:
+    - interval: {{ .Values.metrics.interval }}
+      port: metrics
+  selector:
+    matchLabels:
+      {{- include "aergia.labels" . | nindent 6 }}
+{{- end }}
 {{- if .Values.servicemonitor.enabled }}
+---
 kind: ServiceMonitor
 apiVersion: monitoring.coreos.com/v1
 metadata:
@@ -8,4 +23,4 @@ metadata:
   name: {{ include "aergia.fullname" . }}-ingress-servicemonitor
 spec:
 {{- toYaml .Values.servicemonitor.spec | nindent 2 }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/aergia/values.yaml b/charts/aergia/values.yaml
index c711794..a2ac519 100644
--- a/charts/aergia/values.yaml
+++ b/charts/aergia/values.yaml
@@ -137,6 +137,10 @@ customSelectors:
   #           - "production"
   #           - "development"
 
+metrics:
+  enabled: true
+  interval: 30s
+
 servicemonitor:
   enabled: false
   spec: