From ad507d8ee4888948351370af0933df82beb22657 Mon Sep 17 00:00:00 2001 From: zowhoey <11893985+zowhoey@users.noreply.github.com> Date: Fri, 15 Mar 2024 10:31:35 +0000 Subject: [PATCH] Move generic agent flags to cmd/agent/core (#3484) --- cmd/agent/core/flags.go | 12 ++++++++++++ pipeline/backend/kubernetes/flags.go | 14 -------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/cmd/agent/core/flags.go b/cmd/agent/core/flags.go index 5e92f74be..001757d0e 100644 --- a/cmd/agent/core/flags.go +++ b/cmd/agent/core/flags.go @@ -97,4 +97,16 @@ var flags = []cli.Flag{ Usage: "backend to run pipelines on", Value: "auto-detect", }, + &cli.IntFlag{ + EnvVars: []string{"WOODPECKER_CONNECT_RETRY_COUNT"}, + Name: "connect-retry-count", + Usage: "number of times to retry connecting to the server", + Value: 5, + }, + &cli.DurationFlag{ + EnvVars: []string{"WOODPECKER_CONNECT_RETRY_DELAY"}, + Name: "connect-retry-delay", + Usage: "duration to wait before retrying to connect to the server", + Value: time.Second * 2, + }, } diff --git a/pipeline/backend/kubernetes/flags.go b/pipeline/backend/kubernetes/flags.go index 4f55e9ec1..6d5fd9c92 100644 --- a/pipeline/backend/kubernetes/flags.go +++ b/pipeline/backend/kubernetes/flags.go @@ -15,8 +15,6 @@ package kubernetes import ( - "time" - "github.com/urfave/cli/v2" ) @@ -62,18 +60,6 @@ var Flags = []cli.Flag{ Name: "backend-k8s-secctx-nonroot", Usage: "`run as non root` Kubernetes security context option", }, - &cli.IntFlag{ - EnvVars: []string{"WOODPECKER_CONNECT_RETRY_COUNT"}, - Name: "connect-retry-count", - Usage: "number of times to retry connecting to the server", - Value: 5, - }, - &cli.DurationFlag{ - EnvVars: []string{"WOODPECKER_CONNECT_RETRY_DELAY"}, - Name: "connect-retry-delay", - Usage: "duration to wait before retrying to connect to the server", - Value: time.Second * 2, - }, &cli.StringSliceFlag{ EnvVars: []string{"WOODPECKER_BACKEND_K8S_PULL_SECRET_NAMES"}, Name: "backend-k8s-pod-image-pull-secret-names",