From 3f7074668300c0c80a866eda56982ef8c7886025 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Mathieu?= <tmathieu.github@fastmail.com>
Date: Thu, 12 Mar 2020 08:29:44 +0100
Subject: [PATCH] fix: persistent volume discrepancy (#30)

---
 sentry-db/Chart.yaml                                           | 2 +-
 sentry/Chart.yaml                                              | 2 +-
 sentry/templates/deployment-sentry-cron.yaml                   | 2 +-
 sentry/templates/deployment-sentry-post-process-forwarder.yaml | 2 +-
 sentry/templates/deployment-sentry-web.yaml                    | 2 +-
 sentry/templates/deployment-sentry-worker-redis.yaml           | 2 +-
 sentry/templates/deployment-sentry-worker.yaml                 | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sentry-db/Chart.yaml b/sentry-db/Chart.yaml
index ed9b57dda..25925c461 100644
--- a/sentry-db/Chart.yaml
+++ b/sentry-db/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: sentry-db
 description: A Helm chart for Kubernetes
 type: application
-version: 0.9.3
+version: 0.9.4
 appVersion: 10.0.0
 dependencies:
   - name: redis
diff --git a/sentry/Chart.yaml b/sentry/Chart.yaml
index 167349a17..02bce90d2 100644
--- a/sentry/Chart.yaml
+++ b/sentry/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: sentry
 description: A Helm chart for Kubernetes
 type: application
-version: 0.9.3
+version: 0.9.4
 appVersion: 10.0.0
diff --git a/sentry/templates/deployment-sentry-cron.yaml b/sentry/templates/deployment-sentry-cron.yaml
index b0decb9eb..8d667a6d6 100644
--- a/sentry/templates/deployment-sentry-cron.yaml
+++ b/sentry/templates/deployment-sentry-cron.yaml
@@ -94,7 +94,7 @@ spec:
       - name: sentry-data
       {{- if and (eq .Values.filestore.backend "filesystem") .Values.filestore.filesystem.persistence.enabled (.Values.filestore.filesystem.persistence.persistentWorkers) }}
         persistentVolumeClaim:
-          claimName: {{ .Values.filestore.filesystem.persistence.existingClaim | default (include "sentry.fullname" .) }}
+          claimName: {{ template "sentry.prefix" . }}sentry-data
       {{- else }}
         emptyDir: {}
       {{ end }}
diff --git a/sentry/templates/deployment-sentry-post-process-forwarder.yaml b/sentry/templates/deployment-sentry-post-process-forwarder.yaml
index 57c75cfcd..af444b307 100644
--- a/sentry/templates/deployment-sentry-post-process-forwarder.yaml
+++ b/sentry/templates/deployment-sentry-post-process-forwarder.yaml
@@ -78,7 +78,7 @@ spec:
       - name: sentry-data
       {{- if and (eq .Values.filestore.backend "filesystem") .Values.filestore.filesystem.persistence.enabled (.Values.filestore.filesystem.persistence.persistentWorkers) }}
         persistentVolumeClaim:
-          claimName: {{ .Values.filestore.filesystem.persistence.existingClaim | default (include "sentry.fullname" .) }}
+          claimName: {{ template "sentry.prefix" . }}sentry-data
       {{- else }}
         emptyDir: {}
       {{ end }}
diff --git a/sentry/templates/deployment-sentry-web.yaml b/sentry/templates/deployment-sentry-web.yaml
index a179f60f0..833564d3e 100644
--- a/sentry/templates/deployment-sentry-web.yaml
+++ b/sentry/templates/deployment-sentry-web.yaml
@@ -103,7 +103,7 @@ spec:
       - name: sentry-data
       {{- if and (eq .Values.filestore.backend "filesystem") .Values.filestore.filesystem.persistence.enabled }}
         persistentVolumeClaim:
-          claimName: {{ .Values.filestore.filesystem.persistence.existingClaim | default (include "sentry.fullname" .) }}
+          claimName: {{ template "sentry.prefix" . }}sentry-data
       {{- else }}
         emptyDir: {}
       {{ end }}
diff --git a/sentry/templates/deployment-sentry-worker-redis.yaml b/sentry/templates/deployment-sentry-worker-redis.yaml
index e8a8f97eb..757707d3e 100644
--- a/sentry/templates/deployment-sentry-worker-redis.yaml
+++ b/sentry/templates/deployment-sentry-worker-redis.yaml
@@ -97,7 +97,7 @@ spec:
       - name: sentry-data
       {{- if and (eq .Values.filestore.backend "filesystem") .Values.filestore.filesystem.persistence.enabled (.Values.filestore.filesystem.persistence.persistentWorkers) }}
         persistentVolumeClaim:
-          claimName: {{ .Values.filestore.filesystem.persistence.existingClaim | default (include "sentry.fullname" .) }}
+          claimName: {{ template "sentry.prefix" . }}sentry-data
       {{- else }}
         emptyDir: {}
       {{ end }}
diff --git a/sentry/templates/deployment-sentry-worker.yaml b/sentry/templates/deployment-sentry-worker.yaml
index 01995ed5a..e6c2b8dc5 100644
--- a/sentry/templates/deployment-sentry-worker.yaml
+++ b/sentry/templates/deployment-sentry-worker.yaml
@@ -93,7 +93,7 @@ spec:
       - name: sentry-data
       {{- if and (eq .Values.filestore.backend "filesystem") .Values.filestore.filesystem.persistence.enabled (.Values.filestore.filesystem.persistence.persistentWorkers) }}
         persistentVolumeClaim:
-          claimName: {{ .Values.filestore.filesystem.persistence.existingClaim | default (include "sentry.fullname" .) }}
+          claimName: {{ template "sentry.prefix" . }}sentry-data
       {{- else }}
         emptyDir: {}
       {{ end }}