prometheus: Increase PV allowance, update helm chart

2022-11-08 19:06:22 +01:00 · 2022-11-08 19:06:22 +01:00 · c41804f3f3
parent 79fb5554ec
commit c41804f3f3
24 changed files with 41 additions and 27 deletions
--- 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
--- 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:
--- 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:
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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:
--- 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:
--- 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
--- 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
--- 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
--- 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:
--- 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:
--- 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
--- 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
--- 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"
--- 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
--- 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
--- a/deploy/base/values/prometheus.yaml
+++ b/deploy/base/values/prometheus.yaml
@ -0,0 +1,3 @@
+server:
+  persistentVolume:
+    size: 16Gi