Skip to content

Commit d652c0d

Browse files
committed
Fix Default Pipelineroot fails
1 parent 7bd866d commit d652c0d

File tree

2 files changed

+23
-22
lines changed

2 files changed

+23
-22
lines changed

backend/src/v2/config/env.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,12 @@ package config
1919
import (
2020
"context"
2121
"fmt"
22-
"github.com/kubeflow/pipelines/backend/src/v2/objectstore"
2322
"io/ioutil"
24-
"sigs.k8s.io/yaml"
2523
"strings"
2624

25+
"github.com/kubeflow/pipelines/backend/src/v2/objectstore"
26+
"sigs.k8s.io/yaml"
27+
2728
"github.com/golang/glog"
2829
k8errors "k8s.io/apimachinery/pkg/api/errors"
2930
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -123,8 +124,7 @@ type SecretRef struct {
123124
SecretKeyKey string `json:"secretKeyKey"`
124125
}
125126

126-
func (c *Config) GetBucketSessionInfo() (objectstore.SessionInfo, error) {
127-
path := c.DefaultPipelineRoot()
127+
func (c *Config) GetBucketSessionInfo(path string) (objectstore.SessionInfo, error) {
128128
bucketConfig, err := objectstore.ParseBucketPathToConfig(path)
129129
if err != nil {
130130
return objectstore.SessionInfo{}, err

backend/src/v2/driver/driver.go

+19-18
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ import (
2222
"strings"
2323
"time"
2424

25-
"github.com/kubeflow/pipelines/backend/src/v2/objectstore"
26-
2725
"github.com/golang/glog"
2826
"github.com/golang/protobuf/ptypes/timestamp"
2927
"github.com/google/uuid"
@@ -34,6 +32,7 @@ import (
3432
"github.com/kubeflow/pipelines/backend/src/v2/config"
3533
"github.com/kubeflow/pipelines/backend/src/v2/expression"
3634
"github.com/kubeflow/pipelines/backend/src/v2/metadata"
35+
"github.com/kubeflow/pipelines/backend/src/v2/objectstore"
3736
"github.com/kubeflow/pipelines/kubernetes_platform/go/kubernetesplatform"
3837
pb "github.com/kubeflow/pipelines/third_party/ml-metadata/go/ml_metadata"
3938
"google.golang.org/protobuf/encoding/protojson"
@@ -134,28 +133,30 @@ func RootDAG(ctx context.Context, opts Options, mlmd *metadata.Client) (executio
134133
}
135134
// TODO(v2): in pipeline spec, rename GCS output directory to pipeline root.
136135
pipelineRoot := opts.RuntimeConfig.GetGcsOutputDirectory()
136+
137+
restConfig, err := rest.InClusterConfig()
138+
if err != nil {
139+
return nil, fmt.Errorf("failed to initialize kubernetes client: %w", err)
140+
}
141+
k8sClient, err := kubernetes.NewForConfig(restConfig)
142+
if err != nil {
143+
return nil, fmt.Errorf("failed to initialize kubernetes client set: %w", err)
144+
}
145+
cfg, err := config.FromConfigMap(ctx, k8sClient, opts.Namespace)
146+
if err != nil {
147+
return nil, err
148+
}
149+
137150
pipelineBucketSessionInfo := objectstore.SessionInfo{}
138151
if pipelineRoot != "" {
139152
glog.Infof("PipelineRoot=%q", pipelineRoot)
140153
} else {
141-
restConfig, err := rest.InClusterConfig()
142-
if err != nil {
143-
return nil, fmt.Errorf("failed to initialize kubernetes client: %w", err)
144-
}
145-
k8sClient, err := kubernetes.NewForConfig(restConfig)
146-
if err != nil {
147-
return nil, fmt.Errorf("failed to initialize kubernetes client set: %w", err)
148-
}
149-
cfg, err := config.FromConfigMap(ctx, k8sClient, opts.Namespace)
150-
if err != nil {
151-
return nil, err
152-
}
153154
pipelineRoot = cfg.DefaultPipelineRoot()
154155
glog.Infof("PipelineRoot=%q from default config", pipelineRoot)
155-
pipelineBucketSessionInfo, err = cfg.GetBucketSessionInfo()
156-
if err != nil {
157-
return nil, err
158-
}
156+
}
157+
pipelineBucketSessionInfo, err = cfg.GetBucketSessionInfo(pipelineRoot)
158+
if err != nil {
159+
return nil, err
159160
}
160161
bucketSessionInfo, err := json.Marshal(pipelineBucketSessionInfo)
161162
if err != nil {

0 commit comments

Comments
 (0)