From 69179e72c0872cde9131cc9d68192d5c472d64c9 Mon Sep 17 00:00:00 2001 From: Trevor Foster Date: Thu, 16 Jul 2020 01:47:17 -0400 Subject: [PATCH] fix: link to server auth mode docs, adds Tulip as official user (#3486) --- USERS.md | 1 + cmd/argo/commands/server.go | 2 +- docs/argo-server-auth-mode.md | 8 ++++++-- docs/cli/argo_server.md | 2 +- ui/src/app/login/components/login.tsx | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/USERS.md b/USERS.md index a79af3f9b5ed..50d21033cb42 100644 --- a/USERS.md +++ b/USERS.md @@ -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/) diff --git a/cmd/argo/commands/server.go b/cmd/argo/commands/server.go index 25567fb3f6a9..cd93179b295b 100644 --- a/cmd/argo/commands/server.go +++ b/cmd/argo/commands/server.go @@ -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") diff --git a/docs/argo-server-auth-mode.md b/docs/argo-server-auth-mode.md index c644728e8d80..138725260957 100644 --- a/docs/argo-server-auth-mode.md +++ b/docs/argo-server-auth-mode.md @@ -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 ... +``` diff --git a/docs/cli/argo_server.md b/docs/cli/argo_server.md index b64cc91d5c96..e3945b7c51a3 100644 --- a/docs/cli/argo_server.md +++ b/docs/cli/argo_server.md @@ -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") diff --git a/ui/src/app/login/components/login.tsx b/ui/src/app/login/components/login.tsx index 2a914eb3f62e..e03445240911 100644 --- a/ui/src/app/login/components/login.tsx +++ b/ui/src/app/login/components/login.tsx @@ -22,7 +22,7 @@ export const Login = () => (

It may not be necessary to be logged in to use Argo Workflows, it depends on how it is configured.

- Learn more. + Learn more.