Fix e2e tests if KUBECTL_EXTERNAL_DIFF env is set

timebertt · Jun 3, 2024 · 0f02849 · 0f02849
1 parent 47e96e7
commit 0f02849
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/test/e2e/exec/exec.go b/test/e2e/exec/exec.go
@@ -75,7 +75,11 @@ func preparePath() {
 func NewPluginCommand(args ...string) *exec.Cmd {
 	// nolint:gosec // no security risk in shared test code
 	command := exec.Command("kubectl", append([]string{"revisions"}, args...)...)
-	command.Env = append(command.Environ(), "PATH="+tmpPath)
+	command.Env = append(command.Environ(),
+		"PATH="+tmpPath,
+		// reset the external diff env in case it is set on the developer's machine
+		"KUBECTL_EXTERNAL_DIFF=",
+	)
 
 	return command
 }