From 838ed6bcf654d7205f7cfbb8f14dd446b88199eb Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Wed, 1 Sep 2021 14:23:01 +0200
Subject: [PATCH] fix: [redis] no envoyfilter if istio is disabled

---
 charts/kubezero-redis/Chart.yaml                                | 2 +-
 .../templates/envoyfilter-custom-redis-cluster.yaml             | 2 +-
 charts/kubezero-redis/templates/envoyfilter-redis-proxy.yaml    | 2 +-
 charts/kubezero-redis/templates/snapshotgroup.yaml              | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/charts/kubezero-redis/Chart.yaml b/charts/kubezero-redis/Chart.yaml
index 76828ff..ebd21d9 100644
--- a/charts/kubezero-redis/Chart.yaml
+++ b/charts/kubezero-redis/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kubezero-redis
 description: KubeZero Umbrella Chart for Redis HA
 type: application
-version: 0.3.3
+version: 0.3.4
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
diff --git a/charts/kubezero-redis/templates/envoyfilter-custom-redis-cluster.yaml b/charts/kubezero-redis/templates/envoyfilter-custom-redis-cluster.yaml
index 316b157..7c4430d 100644
--- a/charts/kubezero-redis/templates/envoyfilter-custom-redis-cluster.yaml
+++ b/charts/kubezero-redis/templates/envoyfilter-custom-redis-cluster.yaml
@@ -1,4 +1,4 @@
-{{- if index .Values "redis-cluster" "enabled" }}
+{{- if and ( index .Values "redis-cluster" "enabled" ) .Values.istio.enabled }}
 apiVersion: networking.istio.io/v1alpha3
 kind: EnvoyFilter
 metadata:
diff --git a/charts/kubezero-redis/templates/envoyfilter-redis-proxy.yaml b/charts/kubezero-redis/templates/envoyfilter-redis-proxy.yaml
index 8685330..7c793ab 100644
--- a/charts/kubezero-redis/templates/envoyfilter-redis-proxy.yaml
+++ b/charts/kubezero-redis/templates/envoyfilter-redis-proxy.yaml
@@ -1,4 +1,4 @@
-{{- if index .Values "redis-cluster" "enabled" }}
+{{- if and ( index .Values "redis-cluster" "enabled" ) .Values.istio.enabled }}
 apiVersion: networking.istio.io/v1alpha3
 kind: EnvoyFilter
 metadata:
diff --git a/charts/kubezero-redis/templates/snapshotgroup.yaml b/charts/kubezero-redis/templates/snapshotgroup.yaml
index 640e859..800cd20 100644
--- a/charts/kubezero-redis/templates/snapshotgroup.yaml
+++ b/charts/kubezero-redis/templates/snapshotgroup.yaml
@@ -9,4 +9,5 @@ spec:
     claimName: {{ $ssg.claimName }}
   schedule:
     {{- toYaml $ssg.schedule | nindent 4 }}
+---
 {{- end }}