Merge pull request etcd-io#9100 from gyuho/flag

etcdmain: unset ETCD_UNSUPPORTED_ARCH after arch check
spzala · Jan 5, 2018 · 2fb9728 · 2fb9728
2 parents 872fd9d + 936c474
commit 2fb9728
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/etcdmain/etcd.go b/etcdmain/etcd.go
@@ -392,6 +392,9 @@ func checkSupportArch() {
 	if runtime.GOARCH == "amd64" || runtime.GOARCH == "ppc64le" {
 		return
 	}
+	// unsupported arch only configured via environment variable
+	// so unset here to not parse through flag
+	defer os.Unsetenv("ETCD_UNSUPPORTED_ARCH")
 	if env, ok := os.LookupEnv("ETCD_UNSUPPORTED_ARCH"); ok && env == runtime.GOARCH {
 		plog.Warningf("running etcd on unsupported architecture %q since ETCD_UNSUPPORTED_ARCH is set", env)
 		return