[stable/kapacitor] Fixes broken Persistent Volume support (#670)

* Fix pvc metadata The `chart` and `name` keys are in the wrong place. * Fix indentation for persistent volume * [stable/kapacitor] bump chart version to 0.2.2 * fix test flake

[stable/kapacitor] Fixes broken Persistent Volume support (#670)
f9a59dc1 · James Gregory · Sean Knox · 1167bf42 · f9a59dc1 · f9a59dc1
Commit f9a59dc1 authored Mar 23, 2017 by James Gregory Committed by Sean Knox Mar 22, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 10 deletions

Chart.yaml stable/kapacitor/Chart.yaml +1 -1

deployment.yaml stable/kapacitor/templates/deployment.yaml +6 -7

pvc.yaml stable/kapacitor/templates/pvc.yaml +2 -2

No files found.
--- a/stable/kapacitor/Chart.yaml
+++ b/stable/kapacitor/Chart.yaml
 name: kapacitor
-version: 0.2.1
+version: 0.2.2
 description: InfluxDB's native data processing engine. It can process both stream and batch data from InfluxDB.
 keywords:
 - kapacitor

--- a/stable/kapacitor/templates/deployment.yaml
+++ b/stable/kapacitor/templates/deployment.yaml
@@ -34,10 +34,10 @@ spec:
 {{ toYaml .Values.resources | indent 12 }}
      volumes:
        - name: data
-        {{ if .Values.persistence.enabled }}
-        persistentVolumeClaim:
-          claimName: {{ template "fullname" . }}
-          {{ else }}
+        {{- if .Values.persistence.enabled }}
+          persistentVolumeClaim:
+            claimName: {{ template "fullname" . }}
+        {{- else }}
          emptyDir: {}
-          {{ end }}
-{{- end }}
\ No newline at end of file
+        {{- end }}
+{{- end }}
--- a/stable/kapacitor/templates/pvc.yaml
+++ b/stable/kapacitor/templates/pvc.yaml
@@ -2,12 +2,12 @@
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+  name: {{ template "fullname" . }}
  labels:
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
    release: "{{ .Release.Name }}"
    heritage: "{{ .Release.Service }}"
    app: {{ template "fullname" . }}
-    name: {{ template "fullname" . }}
  annotations:
  {{- if .Values.persistence.storageClass }}
    volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.storageClass | quote }}