Merge branch '15529-federated-user-accounts' refs #15529

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

diff --cc lib/config/config.default.yml
index 24b2e450eb8c927388ec5add94299fb931163ccf,3338bec511641d03d5b8e9aea458d5a781814e8e..c7a038bec6c5da05fbeef993acae2f31ff7197b9
--- 1/lib/config/config.default.yml
--- 2/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@@ -418,18 -415,16 +418,27 @@@ Clusters
        ProviderAppSecret: ""
        ProviderAppID: ""
  
+       # The cluster ID to delegate the user database.  When set,
+       # logins on this cluster will be redirected to the login cluster
+       # (login cluster must appear in RemoteHosts with Proxy: true)
+       LoginCluster: ""
+ 
+       # How long a cached token belonging to a remote cluster will
+       # remain valid before it needs to be revalidated.
+       RemoteTokenRefresh: 5m
+ 
      Git:
 +      # Path to git or gitolite-shell executable. Each authenticated
 +      # request will execute this program with the single argument "http-backend"
 +      GitCommand: /usr/bin/git
 +
 +      # Path to Gitolite's home directory. If a non-empty path is given,
 +      # the CGI environment will be set up to support the use of
 +      # gitolite-shell as a GitCommand: for example, if GitoliteHome is
 +      # "/gh", then the CGI environment will have GITOLITE_HTTP_HOME=/gh,
 +      # PATH=$PATH:/gh/bin, and GL_BYPASS_ACCESS_CHECKS=1.
 +      GitoliteHome: ""
 +
        # Git repositories must be readable by api server, or you won't be
        # able to submit crunch jobs. To pass the test suites, put a clone
        # of the arvados tree in {git_repositories_dir}/arvados.git or

diff --cc lib/config/export.go
Simple merge

diff --cc lib/config/generated_config.go
index 8a5b4610c2b9b3ec88dd7029eed52bc7de4ce704,ce1d8a1ed8185ba9e94e6e53ddf3708993796b4d..f8a0e097dc7d4e3f9de577d747cd9c0b54a87d0b
--- 1/lib/config/generated_config.go
--- 2/lib/config/generated_config.go
+++ b/lib/config/generated_config.go
@@@ -424,18 -421,16 +424,27 @@@ Clusters
        ProviderAppSecret: ""
        ProviderAppID: ""
  
+       # The cluster ID to delegate the user database.  When set,
+       # logins on this cluster will be redirected to the login cluster
+       # (login cluster must appear in RemoteHosts with Proxy: true)
+       LoginCluster: ""
+ 
+       # How long a cached token belonging to a remote cluster will
+       # remain valid before it needs to be revalidated.
+       RemoteTokenRefresh: 5m
+ 
      Git:
 +      # Path to git or gitolite-shell executable. Each authenticated
 +      # request will execute this program with the single argument "http-backend"
 +      GitCommand: /usr/bin/git
 +
 +      # Path to Gitolite's home directory. If a non-empty path is given,
 +      # the CGI environment will be set up to support the use of
 +      # gitolite-shell as a GitCommand: for example, if GitoliteHome is
 +      # "/gh", then the CGI environment will have GITOLITE_HTTP_HOME=/gh,
 +      # PATH=$PATH:/gh/bin, and GL_BYPASS_ACCESS_CHECKS=1.
 +      GitoliteHome: ""
 +
        # Git repositories must be readable by api server, or you won't be
        # able to submit crunch jobs. To pass the test suites, put a clone
        # of the arvados tree in {git_repositories_dir}/arvados.git or

diff --cc sdk/go/arvados/config.go
Simple merge