Skip to content

Commit 52e45a8

Browse files
authored
Merge pull request #73 from HumairAK/stable
Stable
2 parents bbfb589 + a8fbbd2 commit 52e45a8

File tree

3 files changed

+6
-12
lines changed

3 files changed

+6
-12
lines changed

backend/src/apiserver/client/swf.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ func NewScheduledWorkflowClientOrFatal(initConnectionTimeout time.Duration, clie
6161
if err == nil {
6262
return swfClientInstance
6363
}
64-
glog.Infof("(Expected when in cluster) Failed to create scheduled workflow client by out of cluster kubeconfig. Error: %v", err)
6564

6665
glog.Infof("Starting to create scheduled workflow client by in cluster config.")
6766
b := backoff.NewExponentialBackOff()

backend/src/apiserver/main.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ import (
2020
"encoding/json"
2121
"flag"
2222
"fmt"
23-
"github.com/kubeflow/pipelines/backend/src/apiserver/client"
24-
"google.golang.org/grpc/credentials"
2523
"io"
2624
"io/ioutil"
2725
"math"
@@ -32,6 +30,9 @@ import (
3230
"strings"
3331
"time"
3432

33+
"github.com/kubeflow/pipelines/backend/src/apiserver/client"
34+
"google.golang.org/grpc/credentials"
35+
3536
"github.com/fsnotify/fsnotify"
3637
"github.com/golang/glog"
3738
"github.com/gorilla/mux"
@@ -98,13 +99,13 @@ func main() {
9899
)
99100
err = loadSamples(resourceManager)
100101
if err != nil {
101-
glog.Fatalf("Failed to load samples. Err: %v", err)
102+
glog.Infof("Couldn't load optional pipeline samples: %v", err)
102103
}
103104

104105
if !common.IsMultiUserMode() {
105106
_, err = resourceManager.CreateDefaultExperiment("")
106107
if err != nil {
107-
glog.Fatalf("Failed to create default experiment. Err: %v", err)
108+
glog.Infof("Couldn't create optional default experiment: %v", err)
108109
}
109110
}
110111

backend/src/apiserver/storage/object_store.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ package storage
1616

1717
import (
1818
"bytes"
19-
"fmt"
2019
"github.com/kubeflow/pipelines/backend/src/common/util"
2120
"github.com/kubeflow/pipelines/backend/src/v2/objectstore"
2221
minio "github.com/minio/minio-go/v6"
@@ -25,7 +24,6 @@ import (
2524
"path"
2625
"regexp"
2726
"sigs.k8s.io/yaml"
28-
"strings"
2927
"time"
3028
)
3129

@@ -139,15 +137,11 @@ func (m *MinioObjectStore) GetSignedUrl(bucketConfig *objectstore.Config, secret
139137
return "", err
140138
}
141139

142-
prefixSplit := strings.Split(bucketConfig.Prefix, "/")
143-
filename := prefixSplit[len(prefixSplit)-1]
144-
reqParams := make(url.Values)
145-
reqParams.Set("response-content-disposition", fmt.Sprintf("attachment; filename=\"%s\"", filename))
146-
147140
key, err := objectstore.ArtifactKeyFromURI(artifactURI)
148141
if err != nil {
149142
return "", err
150143
}
144+
reqParams := make(url.Values)
151145
signedUrl, err := s3Client.Presign("GET", bucketConfig.BucketName, key, expirySeconds, reqParams)
152146
if err != nil {
153147
return "", util.Wrap(err, "Failed to generate signed url")

0 commit comments

Comments
 (0)