From d57b937a93ceb7a1ffb0277c12187e4a512661cf Mon Sep 17 00:00:00 2001
From: Kristof Farkas-Pall <kristofarkas@gmail.com>
Date: Thu, 19 Mar 2020 13:01:34 +0000
Subject: [PATCH] Remove forceNsIsolation

---
 charts/argo/templates/server-deployment.yaml | 9 +--------
 charts/argo/values.yaml                      | 2 --
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/charts/argo/templates/server-deployment.yaml b/charts/argo/templates/server-deployment.yaml
index 2677f938..ead58709 100644
--- a/charts/argo/templates/server-deployment.yaml
+++ b/charts/argo/templates/server-deployment.yaml
@@ -48,17 +48,10 @@ spec:
             initialDelaySeconds: 10
             periodSeconds: 20
           env:
-          {{- if .Values.server.forceNamespaceIsolation }}
-          - name: FORCE_NAMESPACE_ISOLATION
-            value: "true"
-          {{- end }}
           - name: IN_CLUSTER
             value: "true"
           - name: ARGO_NAMESPACE
-            valueFrom:
-              fieldRef:
-                apiVersion: v1
-                fieldPath: metadata.namespace
+            value: {{ .Release.Namespace | quote }}
           - name: BASE_HREF
             value: {{ .Values.server.baseHref | quote }}
           resources:
diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml
index 8aa2ee8d..1f002b27 100644
--- a/charts/argo/values.yaml
+++ b/charts/argo/values.yaml
@@ -110,8 +110,6 @@ executor:
 
 server:
   enabled: true
-  # only show workflows where UI installed
-  forceNamespaceIsolation: false
   # only updates base url of resources on client side,
   # it's expected that a proxy server rewrites the request URL and gets rid of this prefix
   # https://github.com/argoproj/argo/issues/716#issuecomment-433213190