Always use etcdctl v3 interface

kubernetes-sigs · Sep 28, 2020 · fd4602a · fd4602a
1 parent 1138060
commit fd4602a
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/binary/etcd.go b/binary/etcd.go
@@ -66,11 +66,8 @@ func isEtcdctlInstalled(version, inputDir string) (bool, error) {
 	if !exists {
 		return false, nil
 	}
-	cmdVersionFlag := "--version"
-	if os.Getenv("ETCDCTL_API") == "3" {
-		cmdVersionFlag = "version"
-	}
-	cmd := exec.Command(path, cmdVersionFlag)
+	cmd := exec.Command(path, "version")
+	cmd.Env = append(os.Environ(), "ETCDCTL_API=3")
 	return util.CmdOutputContains(cmd, fmt.Sprintf("etcdctl version: %s", version))
 }