From 6015b4ee9ba8cde30806dc82b1be3e00fd4b9f53 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Fri, 11 Sep 2020 12:08:58 +0100
Subject: [PATCH] Minot istio tweaks

---
 charts/kubezero-istio/README.md.gotmpl     |  2 ++
 charts/kubezero-istio/templates/istio.yaml | 11 ++++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/charts/kubezero-istio/README.md.gotmpl b/charts/kubezero-istio/README.md.gotmpl
index a0447aa9..2a38ba6e 100644
--- a/charts/kubezero-istio/README.md.gotmpl
+++ b/charts/kubezero-istio/README.md.gotmpl
@@ -17,4 +17,6 @@ Installs Istio Operator and KubeZero Istio profile
 
 ## Resources
 
+- https://istio.io/latest/docs/reference/config/istio.operator.v1alpha1/#IstioOperatorSpec
+- https://github.com/istio/istio/blob/master/manifests/profiles/default.yaml
 - https://istio.io/latest/docs/setup/install/standalone-operator/
diff --git a/charts/kubezero-istio/templates/istio.yaml b/charts/kubezero-istio/templates/istio.yaml
index 50831aeb..92ab6e7c 100644
--- a/charts/kubezero-istio/templates/istio.yaml
+++ b/charts/kubezero-istio/templates/istio.yaml
@@ -34,15 +34,15 @@ spec:
             name: istio-ingressgateway
         {{- end }}
         env:
-        # https://github.com/istio/istio/issues/26524
+        # https://github.com/istio/istio/issues/26524, not in 1.7 !
         #- name: TERMINATION_DRAIN_DURATION_SECONDS
         #  value: "60"
         - name: ISTIO_META_HTTP10
           value: '"1"'
         - name: ISTIO_META_ROUTER_MODE
           value: standard
-        - name: ISTIO_META_IDLE_TIMEOUT
-          value: "3600s"
+        #- name: ISTIO_META_IDLE_TIMEOUT
+        #  value: "3600s"
         {{- if eq .Values.ingress.type "NodePort" }}
         nodeSelector:
           node.kubernetes.io/ingress.public: "30080_30443"
@@ -149,15 +149,12 @@ spec:
       disablePolicyChecks: false
     global:
       jwtPolicy: first-party-jwt
+      logAsJson: true
       omitSidecarInjectorConfigMap: true
       proxy:
         accessLogEncoding: JSON
         autoInject: disabled
-        envoyStatsd:
-          enabled: false
-      useMCP: false
     pilot:
-      sidecar: false
       autoscaleEnabled: false
     mixer:
       policy: