From a66e5ab62c3972382daa4025165843d78ce32819 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20Ma=C5=82ek?= Date: Wed, 20 Mar 2024 14:01:32 +0100 Subject: [PATCH] chore: re-add CONTROLLER_DEVELOPMENT_MODE env support (#40) Co-authored-by: Jintao Zhang --- modules/cli/cli.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/modules/cli/cli.go b/modules/cli/cli.go index eb476cf52..f057cc8b5 100644 --- a/modules/cli/cli.go +++ b/modules/cli/cli.go @@ -50,7 +50,9 @@ func New() *CLI { flagSet.BoolVar(&deferCfg.Version, "version", false, "Print version information.") developmentModeEnabled := manager.DefaultConfig().DevelopmentMode - if v := os.Getenv(envVarFlagPrefix + "DEVELOPMENT_MODE"); v == "true" { // TODO: clean env handling https://github.com/Kong/gateway-operator/issues/19 + // TODO: clean env handling https://github.com/Kong/gateway-operator-archive/issues/19 + if os.Getenv(envVarFlagPrefix+"DEVELOPMENT_MODE") == "true" || + os.Getenv("CONTROLLER_DEVELOPMENT_MODE") == "true" { developmentModeEnabled = true } loggerOpts := lo.ToPtr(*manager.DefaultConfig().LoggerOpts) @@ -116,12 +118,15 @@ func (c *CLI) bindEnvVarsToFlags() (err error) { // by the program. It returns config for controller manager. func (c *CLI) Parse(arguments []string) manager.Config { developmentModeEnabled := manager.DefaultConfig().DevelopmentMode - if v := os.Getenv(envVarFlagPrefix + "DEVELOPMENT_MODE"); v == "true" { // TODO: clean env handling https://github.com/Kong/gateway-operator/issues/19 + // TODO: clean env handling https://github.com/Kong/gateway-operator-archive/issues/19 + if os.Getenv(envVarFlagPrefix+"DEVELOPMENT_MODE") == "true" || + os.Getenv("CONTROLLER_DEVELOPMENT_MODE") == "true" { developmentModeEnabled = true } webhookCertDir := manager.DefaultConfig().WebhookCertDir - if certDir := os.Getenv("WEBHOOK_CERT_DIR"); certDir != "" { // TODO: clean env handling https://github.com/Kong/gateway-operator/issues/19 + // TODO: clean env handling https://github.com/Kong/gateway-operator-archive/issues/19 + if certDir := os.Getenv("WEBHOOK_CERT_DIR"); certDir != "" { webhookCertDir = certDir }