Merge branch 'master' of https://github.com/argoproj/argo

Makefile

@@ -424,7 +424,7 @@ $(HOME)/go/bin/swagger:
  go get github.com/go-swagger/go-swagger/cmd/swagger
 
 api/argo-server/swagger.json: $(HOME)/go/bin/swagger $(SWAGGER_FILES)
- swagger mixin -c 412 pkg/apiclient/primary.swagger.json $(SWAGGER_FILES) | sed 's/VERSION/$(VERSION)/' > api/argo-server/swagger.json
+ swagger mixin -c 412 pkg/apiclient/primary.swagger.json $(SWAGGER_FILES) | sed 's/VERSION/$(MANIFESTS_VERSION)/' > api/argo-server/swagger.json
 
 # pre-push
 

docs/managed-namespace.md

@@ -4,6 +4,22 @@
 
 > v2.5 and after
 
-You can install Argo in either cluster scoped or namespace scope configurations. This dictates if you must set-up cluster roles or normal roles.
+You can install Argo in either cluster scoped or namespace scope configurations.
+This dictates if you must set-up cluster roles or normal roles.
 
-In namespace scope configuration, you must run both the Workflow Controller and Argo Server using `--namespaced`.
+In namespace scope configuration, you must run both the Workflow Controller and
+Argo Server using `--namespaced`. If you would like to have the workflows
+running in a separated namespace, add `--managed-namespace` as well.
+
+For example:
+
+```
+ - args:
+ - --configmap
+ - workflow-controller-configmap
+ - --executor-image
+ - argoproj/workflow-controller:v2.5.1
+ - --namespaced
+ - --managed-namespace
+ - default
+```

docs/workflow-controller-configmap.yaml

@@ -14,10 +14,6 @@ data:
  # controller watches workflows and pods that *are not* labeled with an instance id.
  instanceID: my-ci-controller
 
- # namespace limits the controller's watch/queries to a specific namespace. This allows the
- # controller to run with namespace scope (Role), instead of cluster scope (ClusterRole).
- namespace: argo
-
  # Parallelism limits the max total parallel workflows that can execute at the same time
  # (available since Argo v2.3)
  parallelism: 10