From 88ce4065128673be9ecbeb1102153dbf23627240 Mon Sep 17 00:00:00 2001 From: Jacek Wysocki Date: Wed, 31 Jul 2024 11:14:50 +0200 Subject: [PATCH] fix: logs container using tmp dir instead of /data (#5708) * fix: logs container using tmp dir * fix: remove chmod * fix: remove data directory * fix: remove data directory --- build/logs-server/Dockerfile | 3 --- pkg/logs/adapter/minio_v2.go | 9 +++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/build/logs-server/Dockerfile b/build/logs-server/Dockerfile index d29a3fa9b8b..30ddd60661b 100644 --- a/build/logs-server/Dockerfile +++ b/build/logs-server/Dockerfile @@ -5,9 +5,6 @@ RUN apk --no-cache --update add ca-certificates && (rm -rf /var/cache/apk/* || 0 WORKDIR /root/ -RUN mkdir /data -RUN chown -R 1001:0 /data - COPY testkube-logs-server /bin/app USER 1001 EXPOSE 8088 diff --git a/pkg/logs/adapter/minio_v2.go b/pkg/logs/adapter/minio_v2.go index 7588661b850..920f840d0e0 100644 --- a/pkg/logs/adapter/minio_v2.go +++ b/pkg/logs/adapter/minio_v2.go @@ -15,13 +15,14 @@ import ( minioconnecter "github.com/kubeshop/testkube/pkg/storage/minio" ) -// DefaultDataDir is a default directory where logs are stored (logs-service Dockerfile creates this directory) -const DefaultDataDir = "/data" - var _ Adapter = &MinioV2Adapter{} // NewMinioV2Adapter creates new MinioV2Adapter which will send data to local MinIO bucket func NewMinioV2Adapter(endpoint, accessKeyID, secretAccessKey, region, token, bucket string, ssl, skipVerify bool, certFile, keyFile, caFile string) (*MinioV2Adapter, error) { + dir, err := os.MkdirTemp("", "minio") + if err != nil { + return nil, err + } ctx := context.Background() opts := minioconnecter.GetTLSOptions(ssl, skipVerify, certFile, keyFile, caFile) c := &MinioV2Adapter{ @@ -30,7 +31,7 @@ func NewMinioV2Adapter(endpoint, accessKeyID, secretAccessKey, region, token, bu bucket: bucket, region: region, files: make(map[string]*os.File), - path: DefaultDataDir, + path: dir, } minioClient, err := c.minioConnecter.GetClient() if err != nil {