From 27b558dc39bb1067b2bad7f3c1931e7adc322252 Mon Sep 17 00:00:00 2001 From: Forrest Marshall Date: Wed, 15 Jul 2020 13:49:40 -0700 Subject: [PATCH] don't fail on missing cluster proxies --- lib/web/ui/cluster.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/web/ui/cluster.go b/lib/web/ui/cluster.go index 11902b1c53277..395b983eda886 100644 --- a/lib/web/ui/cluster.go +++ b/lib/web/ui/cluster.go @@ -36,11 +36,13 @@ type Cluster struct { Status string `json:"status"` // NodeCount is this cluster number of registered servers NodeCount int `json:"nodeCount"` - // PublicURL is this cluster public URL (its first available proxy URL) + // PublicURL is this cluster public URL (its first available proxy URL), + // or possibly empty if no proxies could be loaded. PublicURL string `json:"publicURL"` // AuthVersion is the cluster auth's service version AuthVersion string `json:"authVersion"` - // ProxyVersion is the cluster proxy's service version + // ProxyVersion is the cluster proxy's service version, + // or possibly empty if no proxies could be loaded. ProxyVersion string `json:"proxyVersion"` } @@ -80,7 +82,7 @@ func GetClusterDetails(site reversetunnel.RemoteSite) (*Cluster, error) { return nil, trace.Wrap(err) } proxyHost, proxyVersion, err := services.GuessProxyHostAndVersion(proxies) - if err != nil { + if err != nil && !trace.IsNotFound(err) { return nil, trace.Wrap(err) }