[arvados] updated: 2.1.0-2651-ge158fecc4

[git repository hosting]

Summary of changes:
 lib/service/tls.go | 3 ---
 1 file changed, 3 deletions(-)

       via  e158fecc41b58f357345ac3114592a429218dc3a (commit)
      from  bd5f21b6a567248d05126d78bab091555764a052 (commit)

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 e158fecc41b58f357345ac3114592a429218dc3a
Author: Tom Clegg <tom at curii.com>
Date:   Thu Jun 30 16:26:59 2022 -0400

    16552: Fix rebase error.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/service/tls.go b/lib/service/tls.go
index 21cd3e2ac..234ee5787 100644
--- a/lib/service/tls.go
+++ b/lib/service/tls.go
@@ -75,9 +75,6 @@ func makeFileLoaderConfig(cluster *arvados.Cluster, logger logrus.FieldLogger) (
 
 	key := strings.TrimPrefix(cluster.TLS.Key, "file://")
 	cert := strings.TrimPrefix(cluster.TLS.Certificate, "file://")
-	if !strings.HasPrefix(key, "file://") || !strings.HasPrefix(cert, "file://") {
-	}
-	key, cert = key[7:], cert[7:]
 
 	update := func() error {
 		cert, err := tls.LoadX509KeyPair(cert, key)

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


hooks/post-receive
--