Merge branch 'main' into baggage-support-and-parent-activity

Author: t-persson

cmd/logarea/main.go

@@ -66,6 +66,10 @@ func main() {
 	app := application.New(v1AlphaLogArea)
 	srv := server.NewWebService(cfg, log, app)
 
+	r := v1alpha.NewRetentionHandler(ctx, cfg, log)
+	r.Start()
+	defer r.Shutdown()
+
 	done := make(chan os.Signal, 1)
 	signal.Notify(done, syscall.SIGINT, syscall.SIGTERM)
 

internal/config/logarea.go

@@ -15,15 +15,49 @@
 // limitations under the License.
 package config
 
-import "flag"
+import (
+	"flag"
+	"time"
+
+	"github.com/sirupsen/logrus"
+)
 
 type LogAreaConfig interface {
 	Config
+	UploadPath() string
+	Retention() time.Duration
+}
+
+// logAreaCfg implements the LogAreaConfig interface
+type logAreaCfg struct {
+	Config
+	uploadPath string
+	retention  time.Duration
 }
 
 // NewLogAreaConfig creates a log area config interface based on input parameters or environment variables.
 func NewLogAreaConfig() LogAreaConfig {
-	cfg := load()
+	var conf logAreaCfg
+	defaultRetention, err := time.ParseDuration(EnvOrDefault("RETENTION", "24h"))
+	if err != nil {
+		logrus.Panic(err)
+	}
+
+	flag.StringVar(&conf.uploadPath, "uploadpath", EnvOrDefault("UPLOAD_PATH", "/tmp/files"), "Path to upload files to.")
+	flag.DurationVar(&conf.retention, "retention", defaultRetention, "Which retention should configured for files")
+	base := load()
 	flag.Parse()
-	return cfg
+	conf.Config = base
+
+	return &conf
+}
+
+// UploadPath is the local path where all files and directories uploaded should be stored.
+func (c logAreaCfg) UploadPath() string {
+	return c.uploadPath
+}
+
+// Retention returns the file retention time.
+func (c logAreaCfg) Retention() time.Duration {
+	return c.retention
 }

manifests/base/api/deployment.yaml

@@ -20,7 +20,7 @@ spec:
       serviceAccountName: etos-api
       containers:
         - name: etos-api
-          image: ghcr.io/eiffel-community/etos-api:a98a4f39
+          image: ghcr.io/eiffel-community/etos-api:3f11cf43
           imagePullPolicy: IfNotPresent
           ports:
             - name: http

manifests/base/executionspace/deployment.yaml

@@ -20,7 +20,7 @@ spec:
       serviceAccountName: etos-executionspace
       containers:
         - name: etos-executionspace
-          image: ghcr.io/eiffel-community/etos-executionspace:a98a4f39
+          image: ghcr.io/eiffel-community/etos-executionspace:3f11cf43
           imagePullPolicy: IfNotPresent
           envFrom:
             - configMapRef:

manifests/base/iut/deployment.yaml

@@ -20,7 +20,7 @@ spec:
       serviceAccountName: etos-iut
       containers:
         - name: etos-iut
-          image: ghcr.io/eiffel-community/etos-iut:a98a4f39
+          image: ghcr.io/eiffel-community/etos-iut:3f11cf43
           imagePullPolicy: IfNotPresent
           env:
             - name: SERVICE_HOST

manifests/base/keys/deployment.yaml

@@ -20,7 +20,7 @@ spec:
       serviceAccountName: etos-keys
       containers:
         - name: etos-keys
-          image: ghcr.io/eiffel-community/etos-keys:a98a4f39
+          image: ghcr.io/eiffel-community/etos-keys:3f11cf43
           imagePullPolicy: IfNotPresent
           env:
             - name: SERVICE_HOST

manifests/base/logarea/deployment.yaml

@@ -20,7 +20,7 @@ spec:
       serviceAccountName: etos-logarea
       containers:
         - name: etos-logarea
-          image: ghcr.io/eiffel-community/etos-logarea:a98a4f39
+          image: ghcr.io/eiffel-community/etos-logarea:3f11cf43
           imagePullPolicy: IfNotPresent
           env:
             - name: SERVICE_HOST

manifests/base/sse/deployment.yaml

@@ -20,7 +20,7 @@ spec:
       serviceAccountName: etos-sse
       containers:
         - name: etos-sse
-          image: ghcr.io/eiffel-community/etos-sse:a98a4f39
+          image: ghcr.io/eiffel-community/etos-sse:3f11cf43
           imagePullPolicy: IfNotPresent
           env:
             - name: SERVICE_HOST