From 73fc1314ff38ce288793690f52038cda9fde543c Mon Sep 17 00:00:00 2001
From: Kristof Farkas-Pall <kristofarkas@gmail.com>
Date: Thu, 12 Mar 2020 08:08:20 +0000
Subject: [PATCH] Rename to singleNamespace to align with events

---
 charts/argo/templates/server-cluster-role.yaml             | 2 +-
 charts/argo/templates/server-crb.yaml                      | 4 ++--
 charts/argo/templates/server-deployment.yaml               | 2 +-
 charts/argo/templates/workflow-aggregate-roles.yaml        | 6 +++---
 charts/argo/templates/workflow-controller-clusterrole.yaml | 2 +-
 charts/argo/templates/workflow-controller-crb.yaml         | 4 ++--
 charts/argo/templates/workflow-controller-deployment.yaml  | 2 +-
 charts/argo/values.yaml                                    | 6 +++---
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/charts/argo/templates/server-cluster-role.yaml b/charts/argo/templates/server-cluster-role.yaml
index a5e648df..2b66f62d 100644
--- a/charts/argo/templates/server-cluster-role.yaml
+++ b/charts/argo/templates/server-cluster-role.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.server.enabled }}
 apiVersion: rbac.authorization.k8s.io/v1
-{{- if .Values.namespaced }}
+{{- if .Values.singleNamespace }}
 kind: Role
 {{ else }}
 kind: ClusterRole
diff --git a/charts/argo/templates/server-crb.yaml b/charts/argo/templates/server-crb.yaml
index 2d4326f0..1fe5c974 100644
--- a/charts/argo/templates/server-crb.yaml
+++ b/charts/argo/templates/server-crb.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.server.enabled -}}
 apiVersion: rbac.authorization.k8s.io/v1
-{{- if .Values.namespaced }}
+{{- if .Values.singleNamespace }}
 kind: RoleBinding
 {{ else }}
 kind: ClusterRoleBinding
@@ -9,7 +9,7 @@ metadata:
   name: {{ .Release.Name }}-{{ .Values.server.name}}-crb
 roleRef:
   apiGroup: rbac.authorization.k8s.io
-  {{- if .Values.namespaced }}
+  {{- if .Values.singleNamespace }}
   kind: Role
   {{ else }}
   kind: ClusterRole
diff --git a/charts/argo/templates/server-deployment.yaml b/charts/argo/templates/server-deployment.yaml
index 29af6a7c..2677f938 100644
--- a/charts/argo/templates/server-deployment.yaml
+++ b/charts/argo/templates/server-deployment.yaml
@@ -30,7 +30,7 @@ spec:
         - name: argo-server
           args:
           - server
-          {{- if .Values.namespaced }}
+          {{- if .Values.singleNamespace }}
           - "--namespaced"
           {{- end }}
           image: "{{ .Values.images.namespace }}/{{ .Values.images.server }}:{{ default .Values.images.tag .Values.server.image.tag }}"
diff --git a/charts/argo/templates/workflow-aggregate-roles.yaml b/charts/argo/templates/workflow-aggregate-roles.yaml
index 83ef6dcf..4957f9c8 100644
--- a/charts/argo/templates/workflow-aggregate-roles.yaml
+++ b/charts/argo/templates/workflow-aggregate-roles.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.createAggregateRoles }}
 apiVersion: rbac.authorization.k8s.io/v1
-{{- if .Values.namespaced }}
+{{- if .Values.singleNamespace }}
 kind: Role
 {{ else }}
 kind: ClusterRole
@@ -28,7 +28,7 @@ rules:
   - watch
 ---
 apiVersion: rbac.authorization.k8s.io/v1
-  {{- if .Values.namespaced }}
+  {{- if .Values.singleNamespace }}
 kind: Role
   {{ else }}
 kind: ClusterRole
@@ -61,7 +61,7 @@ rules:
   - watch
 ---
 apiVersion: rbac.authorization.k8s.io/v1
-  {{- if .Values.namespaced }}
+  {{- if .Values.singleNamespace }}
 kind: Role
   {{ else }}
 kind: ClusterRole
diff --git a/charts/argo/templates/workflow-controller-clusterrole.yaml b/charts/argo/templates/workflow-controller-clusterrole.yaml
index 72253955..702ddbe8 100644
--- a/charts/argo/templates/workflow-controller-clusterrole.yaml
+++ b/charts/argo/templates/workflow-controller-clusterrole.yaml
@@ -1,5 +1,5 @@
 apiVersion: rbac.authorization.k8s.io/v1
-  {{- if .Values.namespaced }}
+  {{- if .Values.singleNamespace }}
 kind: Role
   {{ else }}
 kind: ClusterRole
diff --git a/charts/argo/templates/workflow-controller-crb.yaml b/charts/argo/templates/workflow-controller-crb.yaml
index 788d0a38..1214bc94 100644
--- a/charts/argo/templates/workflow-controller-crb.yaml
+++ b/charts/argo/templates/workflow-controller-crb.yaml
@@ -1,5 +1,5 @@
 apiVersion: rbac.authorization.k8s.io/v1
-{{- if .Values.namespaced }}
+{{- if .Values.singleNamespace }}
 kind: RoleBinding
 {{ else }}
 kind: ClusterRoleBinding
@@ -8,7 +8,7 @@ metadata:
   name: {{ .Release.Name }}-{{ .Values.controller.name}}-binding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
-  {{- if .Values.namespaced }}
+  {{- if .Values.singleNamespace }}
   kind: Role
   {{ else }}
   kind: ClusterRole
diff --git a/charts/argo/templates/workflow-controller-deployment.yaml b/charts/argo/templates/workflow-controller-deployment.yaml
index 37097844..2b8b1dbd 100644
--- a/charts/argo/templates/workflow-controller-deployment.yaml
+++ b/charts/argo/templates/workflow-controller-deployment.yaml
@@ -40,7 +40,7 @@ spec:
           - "{{ .Values.controller.logging.level }}"
           - "--gloglevel"
           - "{{ .Values.controller.logging.globallevel }}"
-          {{- if .Values.namespaced }}
+          {{- if .Values.singleNamespace }}
           - "--namespaced"
           {{- end }}
           env:
diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml
index c3a971f6..e1c9372c 100644
--- a/charts/argo/values.yaml
+++ b/charts/argo/values.yaml
@@ -16,9 +16,9 @@ init:
 
 createAggregateRoles: true
 
-# Install argo components into a single namespace. Apply Roles and RoleBindings instead of the Cluster equivalents,
-# and start argo-cli with the --namespaced flag.
-namespaced: false
+# Restrict Argo to only deploy into a single namespace by apply Roles and RoleBindings instead of the Cluster equivalents,
+# and start argo-cli with the --namespaced flag. Use it in clusters with strict access policy.
+singleNamespace: true
 
 controller:
   image: