From c41804f3f31a8c316b442ad75d678f4cb389b177 Mon Sep 17 00:00:00 2001
From: Rob Watson <rob@netflux.io>
Date: Tue, 8 Nov 2022 19:06:22 +0100
Subject: [PATCH] prometheus: Increase PV allowance, update helm chart

---
 README.md                                             | 11 +++++++++++
 .../templates/alertmanager/clusterrole.yaml           |  2 +-
 .../templates/alertmanager/clusterrolebinding.yaml    |  2 +-
 .../prometheus/templates/alertmanager/cm.yaml         |  2 +-
 .../prometheus/templates/alertmanager/deploy.yaml     |  4 ++--
 .../prometheus/templates/alertmanager/pvc.yaml        |  2 +-
 .../prometheus/templates/alertmanager/service.yaml    |  2 +-
 .../templates/alertmanager/serviceaccount.yaml        |  2 +-
 .../prometheus/templates/node-exporter/daemonset.yaml |  4 ++--
 .../templates/node-exporter/serviceaccount.yaml       |  2 +-
 .../prometheus/templates/node-exporter/svc.yaml       |  2 +-
 .../prometheus/templates/pushgateway/clusterrole.yaml |  2 +-
 .../templates/pushgateway/clusterrolebinding.yaml     |  2 +-
 .../prometheus/templates/pushgateway/deploy.yaml      |  4 ++--
 .../prometheus/templates/pushgateway/service.yaml     |  2 +-
 .../templates/pushgateway/serviceaccount.yaml         |  2 +-
 .../prometheus/templates/server/clusterrole.yaml      |  2 +-
 .../templates/server/clusterrolebinding.yaml          |  2 +-
 .../base/inflated/prometheus/templates/server/cm.yaml |  2 +-
 .../inflated/prometheus/templates/server/deploy.yaml  |  4 ++--
 .../inflated/prometheus/templates/server/pvc.yaml     |  4 ++--
 .../inflated/prometheus/templates/server/service.yaml |  2 +-
 .../prometheus/templates/server/serviceaccount.yaml   |  2 +-
 deploy/base/values/prometheus.yaml                    |  3 +++
 24 files changed, 41 insertions(+), 27 deletions(-)
 create mode 100644 deploy/base/values/prometheus.yaml

diff --git a/README.md b/README.md
index eee6cba..789a608 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,17 @@ and applied with:
 make dev | kubectl apply -f -
 ```
 
+## Helm charts
+
+When required, helm charts can be inflated with:
+
+```
+# install or update the prometheus helm chart:
+make inflate name=prometheus chart=prometheus-community/prometheus
+```
+
+An optional values file can be provided in `deploy/base/values/prometheus.yaml` (update the helm chart name accordingly).
+
 ## Cluster setup
 
 ### cert-manager
diff --git a/deploy/base/inflated/prometheus/templates/alertmanager/clusterrole.yaml b/deploy/base/inflated/prometheus/templates/alertmanager/clusterrole.yaml
index 695d2f8..bc4e68a 100644
--- a/deploy/base/inflated/prometheus/templates/alertmanager/clusterrole.yaml
+++ b/deploy/base/inflated/prometheus/templates/alertmanager/clusterrole.yaml
@@ -7,7 +7,7 @@ metadata:
     component: "alertmanager"
     app: prometheus
     release: prometheus
-    chart: prometheus-15.8.5
+    chart: prometheus-15.8.6
     heritage: Helm
   name: prometheus-alertmanager
 rules:
diff --git a/deploy/base/inflated/prometheus/templates/alertmanager/clusterrolebinding.yaml b/deploy/base/inflated/prometheus/templates/alertmanager/clusterrolebinding.yaml
index b903788..b781aa6 100644
--- a/deploy/base/inflated/prometheus/templates/alertmanager/clusterrolebinding.yaml
+++ b/deploy/base/inflated/prometheus/templates/alertmanager/clusterrolebinding.yaml
@@ -7,7 +7,7 @@ metadata:
     component: "alertmanager"
     app: prometheus
     release: prometheus
-    chart: prometheus-15.8.5
+    chart: prometheus-15.8.6
     heritage: Helm
   name: prometheus-alertmanager
 subjects:
diff --git a/deploy/base/inflated/prometheus/templates/alertmanager/cm.yaml b/deploy/base/inflated/prometheus/templates/alertmanager/cm.yaml
index 9cc4622..ed1ec9a 100644
--- a/deploy/base/inflated/prometheus/templates/alertmanager/cm.yaml
+++ b/deploy/base/inflated/prometheus/templates/alertmanager/cm.yaml
@@ -7,7 +7,7 @@ metadata:
     component: "alertmanager"
     app: prometheus
     release: prometheus
-    chart: prometheus-15.8.5
+    chart: prometheus-15.8.6
     heritage: Helm
   name: prometheus-alertmanager
   namespace: default
diff --git a/deploy/base/inflated/prometheus/templates/alertmanager/deploy.yaml b/deploy/base/inflated/prometheus/templates/alertmanager/deploy.yaml
index dcdb1dd..63c00a2 100644
--- a/deploy/base/inflated/prometheus/templates/alertmanager/deploy.yaml
+++ b/deploy/base/inflated/prometheus/templates/alertmanager/deploy.yaml
@@ -7,7 +7,7 @@ metadata:
     component: "alertmanager"
     app: prometheus
     release: prometheus
-    chart: prometheus-15.8.5
+    chart: prometheus-15.8.6
     heritage: Helm
   name: prometheus-alertmanager
   namespace: default
@@ -24,7 +24,7 @@ spec:
         component: "alertmanager"
         app: prometheus
         release: prometheus
-        chart: prometheus-15.8.5
+        chart: prometheus-15.8.6
         heritage: Helm
     spec:
       serviceAccountName: prometheus-alertmanager
diff --git a/deploy/base/inflated/prometheus/templates/alertmanager/pvc.yaml b/deploy/base/inflated/prometheus/templates/alertmanager/pvc.yaml
index 3d047ae..281a92f 100644
--- a/deploy/base/inflated/prometheus/templates/alertmanager/pvc.yaml
+++ b/deploy/base/inflated/prometheus/templates/alertmanager/pvc.yaml
@@ -7,7 +7,7 @@ metadata:
     component: "alertmanager"
     app: prometheus
     release: prometheus
-    chart: prometheus-15.8.5
+    chart: prometheus-15.8.6
     heritage: Helm
   name: prometheus-alertmanager
   namespace: default
diff --git a/deploy/base/inflated/prometheus/templates/alertmanager/service.yaml b/deploy/base/inflated/prometheus/templates/alertmanager/service.yaml
index ef08edb..0f1bcf7 100644
--- a/deploy/base/inflated/prometheus/templates/alertmanager/service.yaml
+++ b/deploy/base/inflated/prometheus/templates/alertmanager/service.yaml
@@ -7,7 +7,7 @@ metadata:
     component: "alertmanager"
     app: prometheus
     release: prometheus
-    chart: prometheus-15.8.5
+    chart: prometheus-15.8.6
     heritage: Helm
   name: prometheus-alertmanager
   namespace: default
diff --git a/deploy/base/inflated/prometheus/templates/alertmanager/serviceaccount.yaml b/deploy/base/inflated/prometheus/templates/alertmanager/serviceaccount.yaml
index d04d046..06cbb2c 100644
--- a/deploy/base/inflated/prometheus/templates/alertmanager/serviceaccount.yaml
+++ b/deploy/base/inflated/prometheus/templates/alertmanager/serviceaccount.yaml
@@ -7,7 +7,7 @@ metadata:
     component: "alertmanager"
     app: prometheus
     release: prometheus
-    chart: prometheus-15.8.5
+    chart: prometheus-15.8.6
     heritage: Helm
   name: prometheus-alertmanager
   namespace: default
diff --git a/deploy/base/inflated/prometheus/templates/node-exporter/daemonset.yaml b/deploy/base/inflated/prometheus/templates/node-exporter/daemonset.yaml
index 919a5f3..70dad98 100644
--- a/deploy/base/inflated/prometheus/templates/node-exporter/daemonset.yaml
+++ b/deploy/base/inflated/prometheus/templates/node-exporter/daemonset.yaml
@@ -7,7 +7,7 @@ metadata:
     component: "node-exporter"
     app: prometheus
     release: prometheus
-    chart: prometheus-15.8.5
+    chart: prometheus-15.8.6
     heritage: Helm
   name: prometheus-node-exporter
   namespace: default
@@ -25,7 +25,7 @@ spec:
         component: "node-exporter"
         app: prometheus
         release: prometheus
-        chart: prometheus-15.8.5
+        chart: prometheus-15.8.6
         heritage: Helm
     spec:
       serviceAccountName: prometheus-node-exporter
diff --git a/deploy/base/inflated/prometheus/templates/node-exporter/serviceaccount.yaml b/deploy/base/inflated/prometheus/templates/node-exporter/serviceaccount.yaml
index fd13b44..9cc17e4 100644
--- a/deploy/base/inflated/prometheus/templates/node-exporter/serviceaccount.yaml
+++ b/deploy/base/inflated/prometheus/templates/node-exporter/serviceaccount.yaml
@@ -7,7 +7,7 @@ metadata:
     component: "node-exporter"
     app: prometheus
     release: prometheus
-    chart: prometheus-15.8.5
+    chart: prometheus-15.8.6
     heritage: Helm
   name: prometheus-node-exporter
   namespace: default
diff --git a/deploy/base/inflated/prometheus/templates/node-exporter/svc.yaml b/deploy/base/inflated/prometheus/templates/node-exporter/svc.yaml
index 03a896a..be7f2bd 100644
--- a/deploy/base/inflated/prometheus/templates/node-exporter/svc.yaml
+++ b/deploy/base/inflated/prometheus/templates/node-exporter/svc.yaml
@@ -9,7 +9,7 @@ metadata:
     component: "node-exporter"
     app: prometheus
     release: prometheus
-    chart: prometheus-15.8.5
+    chart: prometheus-15.8.6
     heritage: Helm
   name: prometheus-node-exporter
   namespace: default
diff --git a/deploy/base/inflated/prometheus/templates/pushgateway/clusterrole.yaml b/deploy/base/inflated/prometheus/templates/pushgateway/clusterrole.yaml
index 5939cf4..cf467a5 100644
--- a/deploy/base/inflated/prometheus/templates/pushgateway/clusterrole.yaml
+++ b/deploy/base/inflated/prometheus/templates/pushgateway/clusterrole.yaml
@@ -7,7 +7,7 @@ metadata:
     component: "pushgateway"
     app: prometheus
     release: prometheus
-    chart: prometheus-15.8.5
+    chart: prometheus-15.8.6
     heritage: Helm
   name: prometheus-pushgateway
 rules:
diff --git a/deploy/base/inflated/prometheus/templates/pushgateway/clusterrolebinding.yaml b/deploy/base/inflated/prometheus/templates/pushgateway/clusterrolebinding.yaml
index a8dac58..8833aa5 100644
--- a/deploy/base/inflated/prometheus/templates/pushgateway/clusterrolebinding.yaml
+++ b/deploy/base/inflated/prometheus/templates/pushgateway/clusterrolebinding.yaml
@@ -7,7 +7,7 @@ metadata:
     component: "pushgateway"
     app: prometheus
     release: prometheus
-    chart: prometheus-15.8.5
+    chart: prometheus-15.8.6
     heritage: Helm
   name: prometheus-pushgateway
 subjects:
diff --git a/deploy/base/inflated/prometheus/templates/pushgateway/deploy.yaml b/deploy/base/inflated/prometheus/templates/pushgateway/deploy.yaml
index 8d39bfd..4f96b55 100644
--- a/deploy/base/inflated/prometheus/templates/pushgateway/deploy.yaml
+++ b/deploy/base/inflated/prometheus/templates/pushgateway/deploy.yaml
@@ -7,7 +7,7 @@ metadata:
     component: "pushgateway"
     app: prometheus
     release: prometheus
-    chart: prometheus-15.8.5
+    chart: prometheus-15.8.6
     heritage: Helm
   name: prometheus-pushgateway
   namespace: default
@@ -24,7 +24,7 @@ spec:
         component: "pushgateway"
         app: prometheus
         release: prometheus
-        chart: prometheus-15.8.5
+        chart: prometheus-15.8.6
         heritage: Helm
     spec:
       serviceAccountName: prometheus-pushgateway
diff --git a/deploy/base/inflated/prometheus/templates/pushgateway/service.yaml b/deploy/base/inflated/prometheus/templates/pushgateway/service.yaml
index 3adf4c0..e1746fa 100644
--- a/deploy/base/inflated/prometheus/templates/pushgateway/service.yaml
+++ b/deploy/base/inflated/prometheus/templates/pushgateway/service.yaml
@@ -9,7 +9,7 @@ metadata:
     component: "pushgateway"
     app: prometheus
     release: prometheus
-    chart: prometheus-15.8.5
+    chart: prometheus-15.8.6
     heritage: Helm
   name: prometheus-pushgateway
   namespace: default
diff --git a/deploy/base/inflated/prometheus/templates/pushgateway/serviceaccount.yaml b/deploy/base/inflated/prometheus/templates/pushgateway/serviceaccount.yaml
index bc23415..73d7f0a 100644
--- a/deploy/base/inflated/prometheus/templates/pushgateway/serviceaccount.yaml
+++ b/deploy/base/inflated/prometheus/templates/pushgateway/serviceaccount.yaml
@@ -7,7 +7,7 @@ metadata:
     component: "pushgateway"
     app: prometheus
     release: prometheus
-    chart: prometheus-15.8.5
+    chart: prometheus-15.8.6
     heritage: Helm
   name: prometheus-pushgateway
   namespace: default
diff --git a/deploy/base/inflated/prometheus/templates/server/clusterrole.yaml b/deploy/base/inflated/prometheus/templates/server/clusterrole.yaml
index cb37e8a..c05cd1a 100644
--- a/deploy/base/inflated/prometheus/templates/server/clusterrole.yaml
+++ b/deploy/base/inflated/prometheus/templates/server/clusterrole.yaml
@@ -7,7 +7,7 @@ metadata:
     component: "server"
     app: prometheus
     release: prometheus
-    chart: prometheus-15.8.5
+    chart: prometheus-15.8.6
     heritage: Helm
   name: prometheus-server
 rules:
diff --git a/deploy/base/inflated/prometheus/templates/server/clusterrolebinding.yaml b/deploy/base/inflated/prometheus/templates/server/clusterrolebinding.yaml
index 28588ea..d9cd896 100644
--- a/deploy/base/inflated/prometheus/templates/server/clusterrolebinding.yaml
+++ b/deploy/base/inflated/prometheus/templates/server/clusterrolebinding.yaml
@@ -7,7 +7,7 @@ metadata:
     component: "server"
     app: prometheus
     release: prometheus
-    chart: prometheus-15.8.5
+    chart: prometheus-15.8.6
     heritage: Helm
   name: prometheus-server
 subjects:
diff --git a/deploy/base/inflated/prometheus/templates/server/cm.yaml b/deploy/base/inflated/prometheus/templates/server/cm.yaml
index 9d0daa4..c6a82a5 100644
--- a/deploy/base/inflated/prometheus/templates/server/cm.yaml
+++ b/deploy/base/inflated/prometheus/templates/server/cm.yaml
@@ -7,7 +7,7 @@ metadata:
     component: "server"
     app: prometheus
     release: prometheus
-    chart: prometheus-15.8.5
+    chart: prometheus-15.8.6
     heritage: Helm
   name: prometheus-server
   namespace: default
diff --git a/deploy/base/inflated/prometheus/templates/server/deploy.yaml b/deploy/base/inflated/prometheus/templates/server/deploy.yaml
index 51f11f0..3cd934f 100644
--- a/deploy/base/inflated/prometheus/templates/server/deploy.yaml
+++ b/deploy/base/inflated/prometheus/templates/server/deploy.yaml
@@ -7,7 +7,7 @@ metadata:
     component: "server"
     app: prometheus
     release: prometheus
-    chart: prometheus-15.8.5
+    chart: prometheus-15.8.6
     heritage: Helm
   name: prometheus-server
   namespace: default
@@ -24,7 +24,7 @@ spec:
         component: "server"
         app: prometheus
         release: prometheus
-        chart: prometheus-15.8.5
+        chart: prometheus-15.8.6
         heritage: Helm
     spec:
       enableServiceLinks: true
diff --git a/deploy/base/inflated/prometheus/templates/server/pvc.yaml b/deploy/base/inflated/prometheus/templates/server/pvc.yaml
index f329c5c..54917c8 100644
--- a/deploy/base/inflated/prometheus/templates/server/pvc.yaml
+++ b/deploy/base/inflated/prometheus/templates/server/pvc.yaml
@@ -7,7 +7,7 @@ metadata:
     component: "server"
     app: prometheus
     release: prometheus
-    chart: prometheus-15.8.5
+    chart: prometheus-15.8.6
     heritage: Helm
   name: prometheus-server
   namespace: default
@@ -16,4 +16,4 @@ spec:
     - ReadWriteOnce
   resources:
     requests:
-      storage: "8Gi"
+      storage: "16Gi"
diff --git a/deploy/base/inflated/prometheus/templates/server/service.yaml b/deploy/base/inflated/prometheus/templates/server/service.yaml
index f5400b0..7c41a26 100644
--- a/deploy/base/inflated/prometheus/templates/server/service.yaml
+++ b/deploy/base/inflated/prometheus/templates/server/service.yaml
@@ -7,7 +7,7 @@ metadata:
     component: "server"
     app: prometheus
     release: prometheus
-    chart: prometheus-15.8.5
+    chart: prometheus-15.8.6
     heritage: Helm
   name: prometheus-server
   namespace: default
diff --git a/deploy/base/inflated/prometheus/templates/server/serviceaccount.yaml b/deploy/base/inflated/prometheus/templates/server/serviceaccount.yaml
index 05140df..978c7de 100644
--- a/deploy/base/inflated/prometheus/templates/server/serviceaccount.yaml
+++ b/deploy/base/inflated/prometheus/templates/server/serviceaccount.yaml
@@ -7,7 +7,7 @@ metadata:
     component: "server"
     app: prometheus
     release: prometheus
-    chart: prometheus-15.8.5
+    chart: prometheus-15.8.6
     heritage: Helm
   name: prometheus-server
   namespace: default
diff --git a/deploy/base/values/prometheus.yaml b/deploy/base/values/prometheus.yaml
new file mode 100644
index 0000000..6de96f5
--- /dev/null
+++ b/deploy/base/values/prometheus.yaml
@@ -0,0 +1,3 @@
+server:
+  persistentVolume:
+    size: 16Gi