Preserve environment for extension backend

Commands executed for the extension backend poreserve the existing process environment adding flannel specific variables instead of replacing the whole environment. Signed-off-by: Jaime Caamaño Ruiz <[email protected]>
flannel-io · Jan 27, 2021 · 6c0ec9a · 6c0ec9a
1 parent 14d007b
commit 6c0ec9a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/backend/extension/extension.go b/backend/extension/extension.go
@@ -17,6 +17,7 @@ package extension
 import (
 	"fmt"
 	"io"
+	"os"
 	"strings"
 
 	"encoding/json"
@@ -133,7 +134,7 @@ func (be *ExtensionBackend) RegisterNetwork(ctx context.Context, wg *sync.WaitGr
 // Run a cmd, returning a combined stdout and stderr.
 func runCmd(env []string, stdin string, name string, arg ...string) (string, error) {
 	cmd := exec.Command(name, arg...)
-	cmd.Env = env
+	cmd.Env = append(os.Environ(), env...)
 
 	stdinpipe, err := cmd.StdinPipe()
 	if err != nil {