github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add ETCD env vars for downgrade

Browse Source
This commit is contained in:
Kris
2017-03-21 14:54:04 -07:00
parent 63d8e244b6
commit 723d301b47
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test/e2e/framework/nodes_util.go
View File

@@ -62,8 +62,17 @@ func etcdUpgradeGCE(target_storage, target_version string) error {
} }
func masterUpgradeGCE(rawV string) error { func masterUpgradeGCE(rawV string) error {
env := os.Environ()
// TODO: Remove these variables when they're no longer needed for downgrades.
if TestContext.EtcdUpgradeVersion != "" && TestContext.EtcdUpgradeStorage != "" {
env = append(env,
"TEST_ETCD_VERSION="+TestContext.EtcdUpgradeVersion,
"STORAGE_BACKEND="+TestContext.EtcdUpgradeStorage,
"TEST_ETCD_IMAGE=3.0.17")
}
v := "v" + rawV v := "v" + rawV
_, _, err := RunCmd(gceUpgradeScript(), "-M", v) _, _, err := RunCmdEnv(env, gceUpgradeScript(), "-M", v)
return err return err
} }