From c11dba1e0520278c271438ccec112513a5be81e5 Mon Sep 17 00:00:00 2001
From: stefanprodan <stefan.prodan@gmail.com>
Date: Mon, 14 Oct 2019 21:03:57 +0300
Subject: [PATCH] Add retry policy to docs and examples

---
 artifacts/appmesh/canary.yaml                 |  5 +++++
 docs/gitbook/faq.md                           | 19 ++++++++++++-------
 .../usage/appmesh-progressive-delivery.md     |  5 +++++
 docs/gitbook/usage/progressive-delivery.md    |  5 +++++
 4 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/artifacts/appmesh/canary.yaml b/artifacts/appmesh/canary.yaml
index 05fec161..e1db1314 100644
--- a/artifacts/appmesh/canary.yaml
+++ b/artifacts/appmesh/canary.yaml
@@ -25,6 +25,11 @@ spec:
     portName: http
     # App Mesh reference
     meshName: global
+    # App Mesh retry policy (optional)
+    retries:
+      attempts: 3
+      perTryTimeout: 1s
+      retryOn: "gateway-error,client-error,stream-error"
   # define the canary analysis timing and KPIs
   canaryAnalysis:
     # schedule interval (default 60s)
diff --git a/docs/gitbook/faq.md b/docs/gitbook/faq.md
index 01089ce0..f08de614 100644
--- a/docs/gitbook/faq.md
+++ b/docs/gitbook/faq.md
@@ -373,13 +373,16 @@ spec:
     # HTTP rewrite (optional)
     rewrite:
       uri: /
-    # Envoy timeout and retry policy (optional)
+    # Istio retry policy (optional)
+    retries:
+      attempts: 3
+      perTryTimeout: 1s
+      retryOn: "gateway-error,connect-failure,refused-stream"
+    # Add headers (optional)
     headers:
       request:
         add:
-          x-envoy-upstream-rq-timeout-ms: "15000"
-          x-envoy-max-retries: "10"
-          x-envoy-retry-on: "gateway-error,connect-failure,refused-stream"
+          x-some-header: "value"
     # cross-origin resource sharing policy (optional)
     corsPolicy:
       allowOrigin:
@@ -416,9 +419,7 @@ spec:
     - frontend
   http:
   - appendHeaders:
-      x-envoy-max-retries: "10"
-      x-envoy-retry-on: gateway-error,connect-failure,refused-stream
-      x-envoy-upstream-rq-timeout-ms: "15000"
+      x-some-header: "value"
     corsPolicy:
       allowHeaders:
       - x-some-header
@@ -439,6 +440,10 @@ spec:
     - destination:
         host: podinfo-canary
       weight: 0
+    retries:
+      attempts: 3
+      perTryTimeout: 1s
+      retryOn: "gateway-error,connect-failure,refused-stream"
 ```
 
 For each destination in the virtual service a rule is generated:
diff --git a/docs/gitbook/usage/appmesh-progressive-delivery.md b/docs/gitbook/usage/appmesh-progressive-delivery.md
index 6b13f288..495902dd 100644
--- a/docs/gitbook/usage/appmesh-progressive-delivery.md
+++ b/docs/gitbook/usage/appmesh-progressive-delivery.md
@@ -75,6 +75,11 @@ spec:
     # App Mesh egress (optional) 
     backends:
       - backend.test
+    # App Mesh retry policy (optional)
+    retries:
+      attempts: 3
+      perTryTimeout: 1s
+      retryOn: "gateway-error,client-error,stream-error"
   # define the canary analysis timing and KPIs
   canaryAnalysis:
     # schedule interval (default 60s)
diff --git a/docs/gitbook/usage/progressive-delivery.md b/docs/gitbook/usage/progressive-delivery.md
index 698e4119..54e99415 100644
--- a/docs/gitbook/usage/progressive-delivery.md
+++ b/docs/gitbook/usage/progressive-delivery.md
@@ -70,6 +70,11 @@ spec:
       tls:
         # use ISTIO_MUTUAL when mTLS is enabled
         mode: DISABLE
+    # Istio retry policy (optional)
+    retries:
+      attempts: 3
+      perTryTimeout: 1s
+      retryOn: "gateway-error,connect-failure,refused-stream"
   canaryAnalysis:
     # schedule interval (default 60s)
     interval: 1m