From 2f710f48c04849cad398ad5dd688200c956b5011 Mon Sep 17 00:00:00 2001
From: Mayank Shah <mayankshah1614@gmail.com>
Date: Tue, 2 Jun 2020 01:25:53 +0530
Subject: [PATCH] multicluster: normalize nginx configmap naming (#4508)

For the Edge-20.5.6 release notes: Mention under the Helm section that the user might wanna manually remove the `nginx-configuration` configmap that is left over after this upgrade.

Signed-off-by: Mayank Shah <mayankshah1614@gmail.com>
---
 charts/linkerd2-multicluster/templates/gateway.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/linkerd2-multicluster/templates/gateway.yaml b/charts/linkerd2-multicluster/templates/gateway.yaml
index c7b0ec7fd..a96a63785 100644
--- a/charts/linkerd2-multicluster/templates/gateway.yaml
+++ b/charts/linkerd2-multicluster/templates/gateway.yaml
@@ -3,7 +3,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: nginx-configuration
+  name: linkerd-gateway
   annotations:
     {{.Values.createdByAnnotation}}: {{default (printf "linkerd/helm %s" .Values.linkerdVersion) .Values.cliVersion}}
   namespace: {{.Values.namespace}}
@@ -63,7 +63,7 @@ spec:
       volumes:
         - name: config
           configMap:
-            name: nginx-configuration   
+            name: linkerd-gateway   
       containers:
         - name: nginx
           readinessProbe: