[ARVADOS] updated: 1.3.0-2495-g230e87b9f

[Git user]

Summary of changes:
 services/keepproxy/keepproxy.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

  discards  f6753e7ab025399eae891c7cdabd8204c6400d84 (commit)
       via  230e87b9f39d79628607056c7e950e209a53c60d (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (f6753e7ab025399eae891c7cdabd8204c6400d84)
            \
             N -- N -- N (230e87b9f39d79628607056c7e950e209a53c60d)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 230e87b9f39d79628607056c7e950e209a53c60d
Author: Ward Vandewege <ward at jhvc.com>
Date:   Mon Apr 13 17:57:03 2020 -0400

    If config.yml is available, use the keepstores defined there instead of
    the legacy autodiscover mechanism via the API server.
    
    refs #16328
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at jhvc.com>

diff --git a/services/keepproxy/keepproxy.go b/services/keepproxy/keepproxy.go
index 2b15d7994..547e77e5f 100644
--- a/services/keepproxy/keepproxy.go
+++ b/services/keepproxy/keepproxy.go
@@ -116,6 +116,12 @@ func run(logger log.FieldLogger, cluster *arvados.Cluster) error {
 		return fmt.Errorf("Error setting up arvados client %v", err)
 	}
 
+	// If a config file is available, use the keepstores defined there
+	// instead of the legacy autodiscover mechanism via the API server
+	for k := range cluster.Services.Keepstore.InternalURLs {
+		arv.KeepServiceURIs = append(arv.KeepServiceURIs, k.String())
+	}
+
 	if cluster.SystemLogs.LogLevel == "debug" {
 		keepclient.DebugPrintf = log.Printf
 	}

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


hooks/post-receive
--