X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e68177bfa8de36bd54f705e16e5c4854eafb29a2..3c34e713aa343d56c7cea00a9c998b06dbf411d6:/sdk/go/crunchrunner/crunchrunner.go

diff --git a/sdk/go/crunchrunner/crunchrunner.go b/sdk/go/crunchrunner/crunchrunner.go
index 5e0e101e77..36343d3df3 100644
--- a/sdk/go/crunchrunner/crunchrunner.go
+++ b/sdk/go/crunchrunner/crunchrunner.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"crypto/x509"
 	"encoding/json"
 	"fmt"
 	"git.curoverse.com/arvados.git/sdk/go/arvados"
@@ -10,7 +9,6 @@ import (
 	"io"
 	"io/ioutil"
 	"log"
-	"net/http"
 	"os"
 	"os/exec"
 	"os/signal"
@@ -256,10 +254,10 @@ func runner(api IArvadosClient,
 			}
 			err = api.Update("job_tasks", taskUuid,
 				map[string]interface{}{
-					"job_task": Task{
-						Output:   "",
-						Success:  true,
-						Progress: 1.0}},
+					"job_task": map[string]interface{}{
+						"output":   "",
+						"success":  true,
+						"progress": 1.0}},
 				nil)
 			return nil
 		}
@@ -396,24 +394,6 @@ func main() {
 		log.Fatal(err)
 	}
 
-	// Container may not have certificates installed, so need to look for
-	// /etc/arvados/ca-certificates.crt in addition to normal system certs.
-	var certFiles = []string{
-		"/etc/ssl/certs/ca-certificates.crt", // Debian
-		"/etc/pki/tls/certs/ca-bundle.crt",   // Red Hat
-		"/etc/arvados/ca-certificates.crt",
-	}
-
-	certs := x509.NewCertPool()
-	for _, file := range certFiles {
-		data, err := ioutil.ReadFile(file)
-		if err == nil {
-			log.Printf("Using TLS certificates at %v", file)
-			certs.AppendCertsFromPEM(data)
-		}
-	}
-	api.Client.Transport.(*http.Transport).TLSClientConfig.RootCAs = certs
-
 	jobUuid := os.Getenv("JOB_UUID")
 	taskUuid := os.Getenv("TASK_UUID")
 	tmpdir := os.Getenv("TASK_WORK")