From 111b62ad582a637c6aa87616e0b81a73f54a3c7d Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Fri, 2 Mar 2018 10:26:49 -0800 Subject: [PATCH] pkg/flags: fatal on conflicting environment variable Signed-off-by: Gyuho Lee --- pkg/flags/flag.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkg/flags/flag.go b/pkg/flags/flag.go index 69c464118548..3a8f050af8ca 100644 --- a/pkg/flags/flag.go +++ b/pkg/flags/flag.go @@ -119,9 +119,7 @@ func verifyEnv(prefix string, usedEnvKey, alreadySet map[string]bool) { continue } if alreadySet[kv[0]] { - // TODO: exit with error in v3.4 - plog.Warningf("recognized environment variable %s, but unused: shadowed by corresponding flag", kv[0]) - continue + plog.Fatalf("conflicting environment variable %q is shadowed by corresponding command-line flag (either unset environment variable or disable flag)", kv[0]) } if strings.HasPrefix(env, prefix+"_") { plog.Warningf("unrecognized environment variable %s", env)