From 0be6c886443eedf0920ab7f1827b13a8b567ebd3 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Fri, 16 Apr 2021 12:38:57 +0200
Subject: [PATCH] refactor: Move Istio config to new place

---
 charts/kubezero-istio-ingress/values.yaml | 6 ------
 charts/kubezero-istio/values.yaml         | 4 ++++
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/charts/kubezero-istio-ingress/values.yaml b/charts/kubezero-istio-ingress/values.yaml
index 41186e4..2474b48 100644
--- a/charts/kubezero-istio-ingress/values.yaml
+++ b/charts/kubezero-istio-ingress/values.yaml
@@ -34,9 +34,6 @@ istio-ingress:
         topologyKey: kubernetes.io/hostname
         values: istio-ingressgateway
       type: NodePort
-      env:
-        TERMINATION_DRAIN_DURATION_SECONDS: '"60"'
-        # ISTIO_META_HTTP10: '"1"'
 
       # The node selector is normally the list of nodeports, see CloudBender
       nodeSelector:
@@ -99,9 +96,6 @@ istio-private-ingress:
         topologyKey: kubernetes.io/hostname
         values: istio-private-ingressgateway
       type: NodePort
-      env:
-        TERMINATION_DRAIN_DURATION_SECONDS: '"60"'
-        # ISTIO_META_HTTP10: '"1"'
 
       nodeSelector:
         node.kubernetes.io/ingress.private: "31080_31443"
diff --git a/charts/kubezero-istio/values.yaml b/charts/kubezero-istio/values.yaml
index 398dd39..7b5c7b6 100644
--- a/charts/kubezero-istio/values.yaml
+++ b/charts/kubezero-istio/values.yaml
@@ -35,6 +35,10 @@ istio-discovery:
     enabled: false
 
   meshConfig:
+    defaultConfig:
+      terminationDrainDuration: 60s
+#     proxyMetadata:
+#       ISTIO_META_HTTP10: '"1"'
     accessLogFile: /dev/stdout
     accessLogEncoding: 'JSON'
     h2UpgradePolicy: 'DO_NOT_UPGRADE'