18700: Remove bogus workbench2 InternalURLs.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --git a/lib/install/init.go b/lib/install/init.go
index f79fae7820f47a1cfbc93d0ee90073fce716fe65..adfa64b3b39bd9c672aaa04a201c89fcbd9c0395 100644 (file)
--- a/lib/install/init.go
+++ b/lib/install/init.go
@@ -143,8 +143,6 @@ func (initcmd *initCommand) RunCommand(prog string, args []string, stdin io.Read
           "http://0.0.0.0:8001/": {}
         ExternalURL: {{printf "%q" ( print "https://" .Domain ":4441/" ) }}
       Workbench2:
-        InternalURLs:
-          "http://0.0.0.0:8002/": {}
         ExternalURL: {{printf "%q" ( print "https://" .Domain ":4442/" ) }}
       Health:
         InternalURLs:

diff --git a/sdk/go/health/aggregator.go b/sdk/go/health/aggregator.go
index 296ef65dd1f6b52b30a313aebce20716d1a3d4dc..23d7e8d431b7ed1160f3fcf8796e5b755d1dd078 100644 (file)
--- a/sdk/go/health/aggregator.go
+++ b/sdk/go/health/aggregator.go
@@ -133,7 +133,14 @@ func (agg *Aggregator) ClusterHealth() ClusterHealthResponse {
                }
                mtx.Unlock()
 
+               checkURLs := map[arvados.URL]bool{}
                for addr := range svc.InternalURLs {
+                       checkURLs[addr] = true
+               }
+               if len(checkURLs) == 0 && svc.ExternalURL.Host != "" {
+                       checkURLs[svc.ExternalURL] = true
+               }
+               for addr := range checkURLs {
                        wg.Add(1)
                        go func(svcName arvados.ServiceName, addr arvados.URL) {
                                defer wg.Done()