Skip to content

Commit

Permalink
fix: link to server auth mode docs, adds Tulip as official user (argo…
Browse files Browse the repository at this point in the history
  • Loading branch information
terev committed Jul 16, 2020
1 parent 7a8e2b3 commit 69179e7
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 5 deletions.
1 change: 1 addition & 0 deletions USERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,6 @@ Currently, the following organizations are **officially** using Argo Workflows:
1. [Styra](https://www.styra.com/)
1. [Threekit](https://www.threekit.com/)
1. [Tiger Analytics](https://www.tigeranalytics.com/)
1. [Tulip](https://tulip.com/)
1. [Wavefront](https://www.wavefront.com/)
1. [Wellcome Trust](https://wellcome.ac.uk/)
2 changes: 1 addition & 1 deletion cmd/argo/commands/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ See %s`, help.ArgoSever),
// "-e" for encrypt, like zip
command.Flags().BoolVarP(&secure, "secure", "e", false, "Whether or not we should listen on TLS.")
command.Flags().BoolVar(&htst, "hsts", true, "Whether or not we should add a HTTP Secure Transport Security header. This only has effect if secure is enabled.")
command.Flags().StringArrayVar(&authModes, "auth-mode", []string{"server"}, "API server authentication mode. One of: client|server|sso")
command.Flags().StringArrayVar(&authModes, "auth-mode", []string{"server"}, "API server authentication mode. Any 1 or more length permutation of: client,server,sso")
command.Flags().StringVar(&configMap, "configmap", "workflow-controller-configmap", "Name of K8s configmap to retrieve workflow controller configuration")
command.Flags().BoolVar(&namespaced, "namespaced", false, "run as namespaced mode")
command.Flags().StringVar(&managedNamespace, "managed-namespace", "", "namespace that watches, default to the installation namespace")
Expand Down
8 changes: 6 additions & 2 deletions docs/argo-server-auth-mode.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@ You can choose which kube config the Argo Server uses:

* "server" - in hosted mode, use the kube config of service account, in local mode, use your local kube config.
* "client" - requires clients to provide their Kubernetes bearer token and use that.
* "hybrid" - use the client token if provided, fallback to the server token if note.
* "sso" - since v2.9, use single sign-on, this will use the same service account as per "server" for RBAC. We expect to change this in the future so that the OAuth claims are mapped to service accounts.
* ["sso"](./argo-server-sso.md) - since v2.9, use single sign-on, this will use the same service account as per "server" for RBAC. We expect to change this in the future so that the OAuth claims are mapped to service accounts.

By default, the server will start with auth mode of "server".

To change the server auth mode specify the list as multiple auth-mode flags:
```
argo server --auth-mode sso --auth-mode ...
```
2 changes: 1 addition & 1 deletion docs/cli/argo_server.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ See https://github.com/argoproj/argo/blob/master/docs/argo-server.md
### Options

```
--auth-mode stringArray API server authentication mode. One of: client|server|sso (default [server])
--auth-mode stringArray API server authentication mode. Any 1 or more length permutation of: client,server,sso (default [server])
--basehref string Value for base href in index.html. Used if the server is running behind reverse proxy under subpath different from /. Defaults to the environment variable BASE_HREF. (default "/")
-b, --browser enable automatic launching of the browser [local mode]
--configmap string Name of K8s configmap to retrieve workflow controller configuration (default "workflow-controller-configmap")
Expand Down
2 changes: 1 addition & 1 deletion ui/src/app/login/components/login.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const Login = () => (
</h3>
<p>It may not be necessary to be logged in to use Argo Workflows, it depends on how it is configured.</p>
<p>
<a href='https://github.com/argoproj/argo/blob/master/docs/argo-server-auth.md'>Learn more</a>.
<a href='https://github.com/argoproj/argo/blob/master/docs/argo-server-auth-mode.md'>Learn more</a>.
</p>
</div>

Expand Down

0 comments on commit 69179e7

Please sign in to comment.