From 77c44b53db3249490a0accacb1d0b154e888ad61 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Wed, 9 Oct 2019 09:51:51 -0400
Subject: [PATCH] Update to Ambassador Pro 0.9.0 (#17801)

Signed-off-by: Luke Shumaker <lukeshu@datawire.io>
---
 stable/ambassador/Chart.yaml                       |  2 +-
 stable/ambassador/README.md                        |  2 +-
 .../ambassador/templates/ambassador-pro-auth.yaml  | 14 +++++++++++++-
 stable/ambassador/values.yaml                      |  2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/stable/ambassador/Chart.yaml b/stable/ambassador/Chart.yaml
index 29ec712b02..71ff33458b 100644
--- a/stable/ambassador/Chart.yaml
+++ b/stable/ambassador/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 0.83.0
 description: A Helm chart for Datawire Ambassador
 name: ambassador
-version: 4.3.1
+version: 4.3.2
 icon: https://www.getambassador.io/images/logo.png
 home: https://www.getambassador.io/
 sources:
diff --git a/stable/ambassador/README.md b/stable/ambassador/README.md
index e5fa3c6e21..7e0a4fb390 100755
--- a/stable/ambassador/README.md
+++ b/stable/ambassador/README.md
@@ -90,7 +90,7 @@ The following tables lists the configurable parameters of the Ambassador chart a
 | `volumes`                          | Volumes for the ambassador service                                              | `[]`                              |
 | `pro.enabled`                      | Installs the Ambassador Pro container as a sidecar to Ambassador                | `false`                           |
 | `pro.image.repository`             | Ambassador Pro image                                                            | `quay.io/datawire/ambassador_pro` |
-| `pro.image.tag`                    | Ambassador Pro image tag                                                        | `0.8.0`               |
+| `pro.image.tag`                    | Ambassador Pro image tag                                                        | `0.9.0`                           |
 | `pro.ports.auth`                   | Ambassador Pro authentication port                                              | `8500`                            |
 | `pro.ports.ratelimit`              | Ambassador Pro ratelimit port                                                   | `8500`                            |
 | `pro.logLevel`                     | Log level for Ambassador Pro                                                    | `"info"`                          |
diff --git a/stable/ambassador/templates/ambassador-pro-auth.yaml b/stable/ambassador/templates/ambassador-pro-auth.yaml
index ab91020d0c..f79653fb6e 100644
--- a/stable/ambassador/templates/ambassador-pro-auth.yaml
+++ b/stable/ambassador/templates/ambassador-pro-auth.yaml
@@ -26,5 +26,17 @@ spec:
   {{- end }}
   prefix: /callback
   service: NoTaReAlSeRvIcE
+---
+apiVersion: ambassador/v1
+kind: Mapping
+metadata:
+  name: {{ include "ambassador.fullname" . }}-pro-mapping
+spec:
+  {{- if hasKey .Values.env "AMBASSADOR_ID" }}
+  ambassador_id: {{ .Values.env.AMBASSADOR_ID | quote }}
+  {{- end }}
+  prefix: /.ambassador/
+  rewrite: ""
+  service: 127.0.0.1:{{ .Values.pro.ports.auth }}
 {{- end }}
-{{ end }}
\ No newline at end of file
+{{ end }}
diff --git a/stable/ambassador/values.yaml b/stable/ambassador/values.yaml
index 893f6a222e..146faf4ddd 100644
--- a/stable/ambassador/values.yaml
+++ b/stable/ambassador/values.yaml
@@ -199,7 +199,7 @@ pro:
   enabled: false
   image:
     repository: quay.io/datawire/ambassador_pro
-    tag: 0.8.0
+    tag: 0.9.0
   # As of Ambassador Pro 0.6.0, both the RateLimitService and AuthService use the same port
   ports:
     auth: 8500