Merge pull request #35 from w3f/new-chart

updated chart version, new persistentVolumeRules
w3f · Jan 17, 2021 · 30b74a7 · 30b74a7
2 parents 6ff658f + c0a7450
commit 30b74a7
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 12 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2
 jobs:
   buildImage:
     docker:
-      - image: web3f/ci-commons:v2.4.0
+      - image: web3f/ci-commons:v2.4.4
     steps:
       - checkout
       - setup_remote_docker
@@ -13,7 +13,7 @@ jobs:
 
   publishChart:
     docker:
-      - image: web3f/ci-commons:v2.4.0
+      - image: web3f/ci-commons:v2.4.4
     steps:
       - checkout
       - run:

diff --git a/charts/polkadot-base-services/Chart.yaml b/charts/polkadot-base-services/Chart.yaml
@@ -1,4 +1,4 @@
 description: Base services for Polkadot Node chart.
 name: polkadot-base-services
-version: v0.34.0
+version: v0.34.1
 apiVersion: v2
diff --git a/charts/polkadot-base-services/templates/_helpers.tpl b/charts/polkadot-base-services/templates/_helpers.tpl
@@ -53,6 +53,11 @@ p2p.{{ .Values.domain }}
 grafana.{{ .Values.domain }}
 {{- end }}
 
+{{/* Returns the grafana service name */}}
+{{- define "polkadot-deployer.grafanaService" -}}
+grafana
+{{- end }}
+
 {{/* Returns the external boot node service name */}}
 {{- define "polkadot-deployer.externalBootNodeService" -}}
 {{ .Release.Name }}-external-bootnode

diff --git a/charts/polkadot-base-services/templates/ingress-grafana.yaml b/charts/polkadot-base-services/templates/ingress-grafana.yaml
@@ -25,6 +25,6 @@ spec:
       paths:
       - path: /
         backend:
-          serviceName: grafana
+          serviceName: {{ include "polkadot-deployer.grafanaService" . }}
           servicePort: 80
 {{ end }}
diff --git a/charts/polkadot-base-services/templates/rules/kubernetes-storage.yaml b/charts/polkadot-base-services/templates/rules/kubernetes-storage.yaml
@@ -19,19 +19,23 @@ spec:
         100 * kubelet_volume_stats_available_bytes{job="kubelet"}
           /
         kubelet_volume_stats_capacity_bytes{job="kubelet"}
-          < 3
+          < 10
       for: 1m
       labels:
         severity: critical
         origin: {{ .Values.deploymentName }}
-    - alert: KubePersistentVolumeFullInEightDays
+    - alert: KubePersistentVolumeFillingUp
       annotations:
         message: Based on recent sampling, the PersistentVolume claimed by {{`{{ $labels.persistentvolumeclaim
           }}`}} in Namespace {{`{{ $labels.namespace }}`}} is expected to fill up within four
           days. Currently {{`{{ $value }}`}} bytes are available.
-        runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubepersistentvolumefullinfourdays
+        runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/blob/master/runbook.md#alert-name-kubepersistentvolumefillingup-1
       expr: |
-        kubelet_volume_stats_available_bytes{job="kubelet"} and predict_linear(kubelet_volume_stats_available_bytes{job="kubelet"}[6h], 8 * 24 * 3600) < 0
+        kubelet_volume_stats_used_bytes{job="kubelet"}
+          /
+        kubelet_volume_stats_capacity_bytes{job="kubelet"} > 0.70
+          and
+        kubelet_volume_stats_available_bytes{job="kubelet"} and predict_linear(kubelet_volume_stats_available_bytes{job="kubelet"}[6h], 4 * 24 * 3600) < 0
       for: 40m
       labels:
         severity: critical

diff --git a/charts/polkadot-secrets/Chart.yaml b/charts/polkadot-secrets/Chart.yaml
@@ -1,4 +1,4 @@
 description: Polkadot secrets
 name: polkadot-secrets
-version: v0.34.0
+version: v0.34.1
 apiVersion: v2
diff --git a/charts/polkadot/Chart.yaml b/charts/polkadot/Chart.yaml
@@ -1,4 +1,4 @@
 description: Polkadot Node chart.
 name: polkadot
-version: v0.34.0
+version: v0.34.1
 apiVersion: v2
diff --git a/charts/polkadot/values.yaml b/charts/polkadot/values.yaml
@@ -1,6 +1,6 @@
 image:
   repo: parity/polkadot
-  tag: v0.8.23
+  tag: v0.8.27
 
 initImage:
   repo: web3f/polkadot-deployer
@@ -41,7 +41,7 @@ resources: {}
 
 persistence:
   enabled: false
-  dataSize: 128Gi
+  dataSize: 200Gi
   chainspecSize: 1Gi
   accessModes: [ "ReadWriteOnce" ]