From cc6d74141a399b9f8401e1388bf6913114cad5bc Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Wed, 22 Apr 2020 16:50:06 -0400 Subject: [PATCH] 16343: Fix handling of local CR creation when LoginCluster is used. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- lib/controller/fed_containers.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/controller/fed_containers.go b/lib/controller/fed_containers.go index a923f757f2..c62cea1168 100644 --- a/lib/controller/fed_containers.go +++ b/lib/controller/fed_containers.go @@ -42,13 +42,11 @@ func remoteContainerRequestCreate( return true } - if *clusterId == "" { - *clusterId = h.handler.Cluster.ClusterID - } - - if strings.HasPrefix(currentUser.Authorization.UUID, h.handler.Cluster.ClusterID) && - *clusterId == h.handler.Cluster.ClusterID { - // local user submitting container request to local cluster + if *clusterId == "" || *clusterId == h.handler.Cluster.ClusterID { + // Submitting container request to local cluster. No + // need to set a runtime_token (rails api will create + // one when the container runs) or do a remote cluster + // request. return false } -- 2.30.2