pkg/ansible; Append current environment vars to runner (operator-fram…

…ework#888) * pkg/ansible; Append current environment vars to runner * Flip order of env statements
ac111 · Jan 8, 2019 · d826c3c · d826c3c
1 parent 534f051
commit d826c3c
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/pkg/ansible/runner/runner.go b/pkg/ansible/runner/runner.go
@@ -249,6 +249,8 @@ func (r *runner) Run(ident string, u *unstructured.Unstructured, kubeconfig stri
 		} else {
 			dc = r.cmdFunc(ident, inputDir.Path)
 		}
+		// Append current environment since setting dc.Env to anything other than nil overwrites current env
+		dc.Env = append(dc.Env, os.Environ()...)
 		dc.Env = append(dc.Env, fmt.Sprintf("K8S_AUTH_KUBECONFIG=%s", kubeconfig), fmt.Sprintf("KUBECONFIG=%s", kubeconfig))
 
 		output, err := dc.CombinedOutput()