chore: merge with upstream

cmd/vela-worker/exec.go

@@ -86,7 +86,6 @@ func (w *Worker) exec(index int) error {
 		Logger:              logger,
 		Mock:                w.Config.Mock,
 		Driver:              w.Config.Executor.Driver,
-		LogMethod:           w.Config.Executor.LogMethod,
 		MaxLogSize:          w.Config.Executor.MaxLogSize,
 		LogStreamingTimeout: w.Config.Executor.LogStreamingTimeout,
 		EnforceTrustedRepos: w.Config.Executor.EnforceTrustedRepos,

cmd/vela-worker/run.go

@@ -94,7 +94,6 @@ func run(c *cli.Context) error {
 			// executor configuration
 			Executor: &executor.Setup{
 				Driver:              c.String("executor.driver"),
-				LogMethod:           c.String("executor.log_method"),
 				MaxLogSize:          c.Uint("executor.max_log_size"),
 				LogStreamingTimeout: c.Duration("executor.log_streaming_timeout"),
 				EnforceTrustedRepos: c.Bool("executor.enforce-trusted-repos"),

cmd/vela-worker/server.go

@@ -30,8 +30,8 @@ func (w *Worker) server() (http.Handler, *tls.Config) {
 	// https://pkg.go.dev/github.com/go-vela/worker/router?tab=doc#Load
 	_server := router.Load(
 		middleware.RequestVersion,
+		middleware.ServerAddress(w.Config.Server.Address),
 		middleware.Executors(w.Executors),
-		middleware.Secret(w.Config.Server.Secret),
 		middleware.Logger(logrus.StandardLogger(), time.RFC3339, true),
 	)
 

docker-compose.yml

@@ -21,7 +21,6 @@ services:
       - vela
     environment:
       EXECUTOR_DRIVER: linux
-      EXECUTOR_LOG_METHOD: 'time-chunks'
       QUEUE_DRIVER: redis
       QUEUE_ADDR: 'redis://redis:6379'
       VELA_BUILD_LIMIT: 1

executor/executor_test.go

@@ -45,7 +45,6 @@ func TestExecutor_New(t *testing.T) {
 	_linux, err := linux.New(
 		linux.WithBuild(_build),
 		linux.WithHostname("localhost"),
-		linux.WithLogMethod("byte-chunks"),
 		linux.WithMaxLogSize(2097152),
 		linux.WithPipeline(_pipeline),
 		linux.WithRepo(_repo),
@@ -103,7 +102,6 @@ func TestExecutor_New(t *testing.T) {
 				Build:      _build,
 				Client:     _client,
 				Driver:     constants.DriverLinux,
-				LogMethod:  "byte-chunks",
 				MaxLogSize: 2097152,
 				Pipeline:   _pipeline,
 				Repo:       _repo,

executor/flags.go

@@ -26,13 +26,6 @@ var Flags = []cli.Flag{
 		Usage:    "driver to be used for the executor",
 		Value:    constants.DriverLinux,
 	},
-	&cli.StringFlag{
-		EnvVars:  []string{"VELA_EXECUTOR_LOG_METHOD", "EXECUTOR_LOG_METHOD"},
-		FilePath: "/vela/executor/log_method",
-		Name:     "executor.log_method",
-		Usage:    "method used to publish logs to the server - options: (byte-chunks|time-chunks)",
-		Value:    "byte-chunks",
-	},
 	&cli.UintFlag{
 		EnvVars:  []string{"VELA_EXECUTOR_MAX_LOG_SIZE", "EXECUTOR_MAX_LOG_SIZE"},
 		FilePath: "/vela/executor/max_log_size",