github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 21:53:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #43595 from kubernetes/revert-43533-downgrades

Browse Source 
Automatic merge from submit-queue

Revert "Fix the ETCD env vars for downgrade"

Reverts kubernetes/kubernetes#43533

This was a misunderstanding. It was right. I'm sorry. "fix"
This commit is contained in:
Kubernetes Submit Queue
2017-03-23 19:08:20 -07:00
committed by GitHub
parent 1e879c69ec 638044a1ec
commit f768a3a637
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,9 +66,9 @@ func masterUpgradeGCE(rawV string) error {
// TODO: Remove these variables when they're no longer needed for downgrades. // TODO: Remove these variables when they're no longer needed for downgrades.
if TestContext.EtcdUpgradeVersion != "" && TestContext.EtcdUpgradeStorage != "" { if TestContext.EtcdUpgradeVersion != "" && TestContext.EtcdUpgradeStorage != "" {
env = append(env, env = append(env,
"ETCD_VERSION="+TestContext.EtcdUpgradeVersion, "TEST_ETCD_VERSION="+TestContext.EtcdUpgradeVersion,
"STORAGE_BACKEND="+TestContext.EtcdUpgradeStorage, "STORAGE_BACKEND="+TestContext.EtcdUpgradeStorage,
"ETCD_IMAGE=3.0.17") "TEST_ETCD_IMAGE=3.0.17")
} }
v := "v" + rawV v := "v" + rawV