From 9c39a06ae0ec9b3ee455feb92fc5d7789e0ba14d Mon Sep 17 00:00:00 2001
From: Dale Tristram <dale.tristram@sprinthive.com>
Date: Mon, 25 Nov 2019 22:44:07 +0200
Subject: [PATCH] [stable/fluentd] Remove duplicate pvc resource (#19131)

Signed-off-by: Dale Tristram <dale.tristram@sprinthive.com>
---
 stable/fluentd/Chart.yaml         |  2 +-
 stable/fluentd/templates/pvc.yaml |  2 +-
 stable/fluentd/templates/pvc.yml  | 28 ----------------------------
 3 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 stable/fluentd/templates/pvc.yml

diff --git a/stable/fluentd/Chart.yaml b/stable/fluentd/Chart.yaml
index c2dc29419377..ceb2575c2c6c 100644
--- a/stable/fluentd/Chart.yaml
+++ b/stable/fluentd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 description: A Fluentd Elasticsearch Helm chart for Kubernetes.
 icon: https://raw.githubusercontent.com/fluent/fluentd-docs/master/public/logo/Fluentd_square.png
 name: fluentd
-version: 2.2.1
+version: 2.2.2
 appVersion: v2.4.0
 home: https://www.fluentd.org/
 sources:
diff --git a/stable/fluentd/templates/pvc.yaml b/stable/fluentd/templates/pvc.yaml
index 8fff48ac03bc..5d147d76996f 100644
--- a/stable/fluentd/templates/pvc.yaml
+++ b/stable/fluentd/templates/pvc.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.persistence.enabled -}}
+{{- if and .Values.persistence.enabled (not .Values.autoscaling.enabled) -}}
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
diff --git a/stable/fluentd/templates/pvc.yml b/stable/fluentd/templates/pvc.yml
deleted file mode 100644
index 5d147d76996f..000000000000
--- a/stable/fluentd/templates/pvc.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-{{- if and .Values.persistence.enabled (not .Values.autoscaling.enabled) -}}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ template "fluentd.fullname" . }}
-  labels:
-    app: {{ template "fluentd.name" . }}
-    chart: {{ template "fluentd.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-{{- if .Values.persistence.annotations }}
-  annotations:
-{{ toYaml .Values.persistence.annotations | indent 4 }}
-{{- end }}
-spec:
-  accessModes:
-    - {{ .Values.persistence.accessMode | quote }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.size | quote }}
-{{- if .Values.persistence.storageClass }}
-{{- if (eq "-" .Values.persistence.storageClass) }}
-  storageClassName: ""
-{{- else }}
-  storageClassName: "{{ .Values.persistence.storageClass }}"
-{{- end }}
-{{- end }}
-{{- end -}}