Merge branch 'master' into next

# Conflicts: # helm/templates/geoip-pvc.yaml
2021-03-11 17:43:28 +01:00 · 2021-03-11 17:43:28 +01:00 · 5b31f8edf6
parent 2dfaef4220 00235e039b
commit 5b31f8edf6
1 changed files with 1 additions and 1 deletions
--- a/helm/templates/geoip-pvc.yaml
+++ b/helm/templates/geoip-pvc.yaml
@ -13,5 +13,5 @@ spec:
  - ReadWriteMany
  resources:
    requests:
-      storage: Gi
+      storage: 1Gi
 {{- end }}