[ARVADOS] created: 1.3.0-2511-gb8f531b9d

[Git user]

        at  b8f531b9df0401545003d3e7f4b566bfc96346aa (commit)


commit b8f531b9df0401545003d3e7f4b566bfc96346aa
Merge: 12900ca6b f2e3fb0ff
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date:   Wed Apr 22 18:09:43 2020 -0300

    16356: Merge branch 'master' into 16356-arvboot-health-externalurl
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at di-pentima.com.ar>


commit 12900ca6beeb117dad2fbbed9666a2d6a52cefe5
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date:   Wed Apr 22 18:09:24 2020 -0300

    16356: Makes health aggregator accessible from the outside on arvados boot.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at di-pentima.com.ar>

diff --git a/lib/boot/nginx.go b/lib/boot/nginx.go
index ecbb7a9d3..0f105d6b6 100644
--- a/lib/boot/nginx.go
+++ b/lib/boot/nginx.go
@@ -47,6 +47,7 @@ func (runNginx) Run(ctx context.Context, fail func(error), super *Supervisor) er
 		{"KEEPWEBDL", super.cluster.Services.WebDAVDownload},
 		{"KEEPPROXY", super.cluster.Services.Keepproxy},
 		{"GIT", super.cluster.Services.GitHTTP},
+		{"HEALTH", super.cluster.Services.Health},
 		{"WORKBENCH1", super.cluster.Services.Workbench1},
 		{"WS", super.cluster.Services.Websocket},
 	} {
diff --git a/lib/boot/supervisor.go b/lib/boot/supervisor.go
index 7f5d6a9ba..26f38ac23 100644
--- a/lib/boot/supervisor.go
+++ b/lib/boot/supervisor.go
@@ -549,6 +549,7 @@ func (super *Supervisor) autofillConfig(cfg *arvados.Config) error {
 		if svc.ExternalURL.Host == "" {
 			if svc == &cluster.Services.Controller ||
 				svc == &cluster.Services.GitHTTP ||
+				svc == &cluster.Services.Health ||
 				svc == &cluster.Services.Keepproxy ||
 				svc == &cluster.Services.WebDAV ||
 				svc == &cluster.Services.WebDAVDownload ||
diff --git a/sdk/python/tests/nginx.conf b/sdk/python/tests/nginx.conf
index 6e872a615..85b4f5b37 100644
--- a/sdk/python/tests/nginx.conf
+++ b/sdk/python/tests/nginx.conf
@@ -71,6 +71,25 @@ http {
       proxy_request_buffering off;
     }
   }
+  upstream health {
+    server {{LISTENHOST}}:{{HEALTHPORT}};
+  }
+  server {
+    listen {{LISTENHOST}}:{{HEALTHSSLPORT}} ssl default_server;
+    server_name health;
+    ssl_certificate "{{SSLCERT}}";
+    ssl_certificate_key "{{SSLKEY}}";
+    location  / {
+      proxy_pass http://health;
+      proxy_set_header Host $http_host;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-Proto https;
+      proxy_redirect off;
+
+      proxy_http_version 1.1;
+      proxy_request_buffering off;
+    }
+  }
   server {
     listen {{LISTENHOST}}:{{KEEPWEBDLSSLPORT}} ssl default_server;
     server_name keep-web-dl ~.*;
diff --git a/sdk/python/tests/run_test_server.py b/sdk/python/tests/run_test_server.py
index 734bb0427..420fcc48c 100644
--- a/sdk/python/tests/run_test_server.py
+++ b/sdk/python/tests/run_test_server.py
@@ -615,6 +615,8 @@ def run_nginx():
     nginxconf['KEEPPROXYSSLPORT'] = external_port_from_config("Keepproxy")
     nginxconf['GITPORT'] = internal_port_from_config("GitHTTP")
     nginxconf['GITSSLPORT'] = external_port_from_config("GitHTTP")
+    nginxconf['HEALTHPORT'] = internal_port_from_config("Health")
+    nginxconf['HEALTHSSLPORT'] = external_port_from_config("Health")
     nginxconf['WSPORT'] = internal_port_from_config("Websocket")
     nginxconf['WSSSLPORT'] = external_port_from_config("Websocket")
     nginxconf['WORKBENCH1PORT'] = internal_port_from_config("Workbench1")

-----------------------------------------------------------------------


hooks/post-receive
--