Skip to content

Commit

Permalink
don't fail on missing cluster proxies
Browse files Browse the repository at this point in the history
  • Loading branch information
fspmarshall committed Jul 17, 2020
1 parent 1ee61a1 commit b500262
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions lib/web/ui/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
}

Expand Down Expand Up @@ -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)
}

Expand Down

0 comments on commit b500262

Please sign in to comment.