Issue helm#15291: Add finalizer to pvc by default

- Add finalizers to pvc - Add persistence.finalizers to values.yaml - Use default values.yaml for finalizers - Bump patch version Signed-off-by: Jeff May <[email protected]>
jeffmay · Jul 7, 2019 · 1f4648f · 1f4648f
1 parent 8b56bd7
commit 1f4648f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/stable/grafana/Chart.yaml b/stable/grafana/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: grafana
-version: 3.5.7
+version: 3.5.8
 appVersion: 6.2.4
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.

diff --git a/stable/grafana/templates/pvc.yaml b/stable/grafana/templates/pvc.yaml
@@ -15,6 +15,13 @@ metadata:
   {{- end }}
   {{- with .Values.persistence.finalizers  }}
   finalizers:
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+    - kubernetes.io/pvc-protection
+>>>>>>> f9fccc12c... Add finalizers to pvc
+=======
+>>>>>>> 7fe052189... Use default values.yaml for finalizers
 {{ toYaml . | indent 4 }}
   {{- end }}
 spec: