16552: Fix rebase error.

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

diff --git a/lib/service/tls.go b/lib/service/tls.go
index 21cd3e2ac25d8030e766d0a7e572a4de50209db1..234ee5787855c53929af5885590fb1abdeaece80 100644 (file)
--- 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)