Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion kubernetes/cmd/task-executor/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ package main

import (
"context"
"fmt"
"net/http"
"os"
"os/signal"
Expand All @@ -36,7 +37,10 @@ func main() {
cfg := config.NewConfig()
cfg.LoadFromEnv()
cfg.LoadFromFlags()

if err := cfg.InitKlog(); err != nil {
fmt.Println("failed to init klog")
os.Exit(1)
}
klog.InfoS("task-executor starting", "dataDir", cfg.DataDir, "listenAddr", cfg.ListenAddr, "sidecarMode", cfg.EnableSidecarMode)

// Initialize TaskStore
Expand Down
1 change: 1 addition & 0 deletions kubernetes/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ require (
google.golang.org/protobuf v1.36.5 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.33.0 // indirect
k8s.io/apiserver v0.33.0 // indirect
Expand Down
2 changes: 2 additions & 0 deletions kubernetes/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,8 @@ gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSP
gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M=
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
Expand Down
39 changes: 39 additions & 0 deletions kubernetes/internal/task-executor/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,13 @@ package config

import (
"flag"
"fmt"
"os"
"path"
"time"

"gopkg.in/natefinch/lumberjack.v2"
"k8s.io/klog/v2"
)

type Config struct {
Expand All @@ -29,6 +34,10 @@ type Config struct {
ReconcileInterval time.Duration
EnableSidecarMode bool
MainContainerName string
LogMaxSize int
LogMaxBackups int
LogMaxAge int
LogDir string
}

func NewConfig() *Config {
Expand All @@ -41,6 +50,10 @@ func NewConfig() *Config {
ReconcileInterval: 500 * time.Millisecond,
EnableSidecarMode: false,
MainContainerName: "main",
LogMaxSize: 100,
LogMaxBackups: 10,
LogMaxAge: 7,
LogDir: "logs",
}
}

Expand Down Expand Up @@ -68,5 +81,31 @@ func (c *Config) LoadFromFlags() {
flag.StringVar(&c.CRISocket, "cri-socket", c.CRISocket, "CRI socket path for container runner mode")
flag.BoolVar(&c.EnableSidecarMode, "enable-sidecar-mode", c.EnableSidecarMode, "enable sidecar runner mode")
flag.StringVar(&c.MainContainerName, "main-container-name", c.MainContainerName, "main container name")
// set log flags
flag.IntVar(&c.LogMaxSize, "log-max-size", c.LogMaxSize, "maximum log file size in MB")
flag.IntVar(&c.LogMaxBackups, "log-max-backups", c.LogMaxBackups, "maximum number of log backup files")
flag.IntVar(&c.LogMaxAge, "log-max-age", c.LogMaxAge, "maximum number of days to keep log files")
flag.StringVar(&c.LogDir, "log-dir", c.LogDir, "log file directory")
flag.Parse()
}

func (c *Config) InitKlog() error {
if err := os.MkdirAll(c.LogDir, 0755); err != nil {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Avoid defaulting log directory to unwritable workdir

This change makes startup depend on creating logs/ (InitKlog) and exits immediately on failure, but the default image runs as non-root (USER $USERID) in WORKDIR /workspace (kubernetes/Dockerfile), which is typically root-owned and not writable by UID 65532. In that default deployment path, os.MkdirAll("logs", 0755) fails and main exits, so task-executor will not come up unless operators override --log-dir or change filesystem permissions.

Useful? React with 👍 / 👎.

return fmt.Errorf("failed to create log directory: %w", err)
}
logFile := path.Join(c.LogDir, "task-executor.log")
fs := flag.NewFlagSet("klog", flag.ContinueOnError)
klog.InitFlags(fs)
fs.Set("logtostderr", "false")
fs.Set("alsologtostderr", "false")
fs.Set("stderrthreshold", "FATAL")
fs.Set("one_output", "true")
klog.SetOutput(&lumberjack.Logger{
Filename: logFile,
MaxSize: c.LogMaxSize,
MaxBackups: c.LogMaxBackups,
MaxAge: c.LogMaxAge,
Compress: true,
})
return nil
}
Loading
Loading