Merge pull request #2222 from weaveworks/issue/2119-allow-google-clou…

…dsdk-env Allow Google Cloud SDK env entries for git
fluxcd · Jul 10, 2019 · d6f7fd0 · d6f7fd0
1 parent ede3e65
commit d6f7fd0
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/git/operations.go b/git/operations.go
@@ -24,8 +24,16 @@ var exemptedTraceCommands = []string{
 	// "config",
 }
 
-// Env vars that are allowed to be inherited from the os
-var allowedEnvVars = []string{"http_proxy", "https_proxy", "no_proxy", "HOME", "GNUPGHOME"}
+// Env vars that are allowed to be inherited from the OS
+var allowedEnvVars = []string{
+	// these are for people using (no) proxies
+	"http_proxy", "https_proxy", "no_proxy",
+	// these are needed for GPG to find its files
+	"HOME", "GNUPGHOME",
+	// these are for Google Cloud SDK to find its files (which will
+	// have to be mounted, if running in a container)
+	"CLOUDSDK_CONFIG", "CLOUDSDK_PYTHON",
+}
 
 type gitCmdConfig struct {
 	dir string