Sidecar execution honor sidecar environment variables instead of main pod (#1068)

Signed-off-by: João Pereira <[email protected]>

Signed-off-by: João Pereira <[email protected]>

Author: joaopapereira

pkg/fetch/vendir.go

@@ -392,7 +392,7 @@ func (v *Vendir) Run(conf []byte, workingDir string, cacheID string) exec.CmdRun
 	cmd.Stdin = bytes.NewReader(conf)
 	cmd.Stdout = &stdoutBs
 	cmd.Stderr = &stderrBs
-	cmd.Env = append(os.Environ(), "VENDIR_CACHE_DIR="+filepath.Join(v.opts.BaseCacheFolder, cacheID))
+	cmd.Env = []string{"VENDIR_CACHE_DIR=" + filepath.Join(v.opts.BaseCacheFolder, cacheID)}
 
 	err := v.cmdRunner.Run(cmd)
 

pkg/sidecarexec/cmd_exec.go

@@ -6,6 +6,7 @@ package sidecarexec
 import (
 	"bytes"
 	"fmt"
+	"os"
 	goexec "os/exec"
 
 	"github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec"
@@ -45,8 +46,9 @@ func (r CmdExec) Run(input CmdInput, output *CmdOutput) error {
 	if len(input.Stdin) > 0 {
 		cmd.Stdin = bytes.NewBuffer(input.Stdin)
 	}
+	cmd.Env = os.Environ()
 	if len(input.Env) > 0 {
-		cmd.Env = input.Env
+		cmd.Env = append(cmd.Env, input.Env...)
 	}
 	if len(input.Dir) > 0 {
 		cmd.Dir = input.Dir