fix: objectstore refactoring

kubeflow · Mar 22, 2022 · 12a151d · 12a151d
1 parent 763d42c
commit 12a151d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/tekton-catalog/objectstore/pkg/writer/objectstorelogger.go b/tekton-catalog/objectstore/pkg/writer/objectstorelogger.go
@@ -92,8 +92,11 @@ func (l *Logger) load(o ObjectStoreConfig) error {
 		WithS3ForcePathStyle(o.S3ForcePathStyle)
 
 	var sess = session.Must(session.NewSession())
-	l.Writer.DefaultBucketName = o.DefaultBucketName
-	l.Writer.client = s3.New(sess, conf)
+	l.Writer = &Writer{
+		DefaultBucketName: o.DefaultBucketName,
+		client:            s3.New(sess, conf),
+		mu:                sync.Mutex{},
+	}
 	input := &s3.CreateBucketInput{
 		Bucket: aws.String(o.DefaultBucketName),
 	}

diff --git a/tekton-catalog/pipeline-loops/pkg/reconciler/pipelinelooprun/controller.go b/tekton-catalog/pipeline-loops/pkg/reconciler/pipelinelooprun/controller.go
@@ -128,10 +128,12 @@ func initLogger(ctx context.Context, kubeClientSet kubernetes.Interface) *zap.Su
 		MaxSize: 1024 * 100, // TODO make it configurable via a configmap.
 	}
 	enabled, err := loadObjectStoreConfig(ctx, kubeClientSet, &loggerConfig)
-	if err == nil {
+	if err == nil && enabled {
 		err = objectStoreLogger.LoadDefaults(loggerConfig)
 		if err == nil {
 			_ = objectStoreLogger.Writer.CreateNewBucket(loggerConfig.DefaultBucketName)
+		} else {
+			logger.Errorf("error connecting to the object store, %v", err)
 		}
 	}
 	if err == nil && enabled {