github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #79733 from yastij/consolidate-etcd-version

Browse Source 
consolidate etcd version per file
This commit is contained in:
Kubernetes Prow Robot 2019-07-05 05:06:36 -07:00 committed by GitHub
commit 915be28b61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,6 +33,8 @@ import (
e2essh "k8s.io/kubernetes/test/e2e/framework/ssh" e2essh "k8s.io/kubernetes/test/e2e/framework/ssh"
) )
const etcdImage = "3.3.10-1"
// EtcdUpgrade upgrades etcd on GCE. // EtcdUpgrade upgrades etcd on GCE.
func EtcdUpgrade(targetStorage, targetVersion string) error { func EtcdUpgrade(targetStorage, targetVersion string) error {
switch TestContext.Provider { switch TestContext.Provider {
@ -62,7 +64,7 @@ func etcdUpgradeGCE(targetStorage, targetVersion string) error {
os.Environ(), os.Environ(),
"TEST_ETCD_VERSION="+targetVersion, "TEST_ETCD_VERSION="+targetVersion,
"STORAGE_BACKEND="+targetStorage, "STORAGE_BACKEND="+targetStorage,
"TEST_ETCD_IMAGE=3.3.10-1") "TEST_ETCD_IMAGE="+etcdImage)
_, _, err := RunCmdEnv(env, gceUpgradeScript(), "-l", "-M") _, _, err := RunCmdEnv(env, gceUpgradeScript(), "-l", "-M")
return err return err
@ -82,7 +84,7 @@ func masterUpgradeGCE(rawV string, enableKubeProxyDaemonSet bool) error {
env = append(env, env = append(env,
"TEST_ETCD_VERSION="+TestContext.EtcdUpgradeVersion, "TEST_ETCD_VERSION="+TestContext.EtcdUpgradeVersion,
"STORAGE_BACKEND="+TestContext.EtcdUpgradeStorage, "STORAGE_BACKEND="+TestContext.EtcdUpgradeStorage,
"TEST_ETCD_IMAGE=3.3.10-1") "TEST_ETCD_IMAGE="+etcdImage)
} else { } else {
// In e2e tests, we skip the confirmation prompt about // In e2e tests, we skip the confirmation prompt about
// implicit etcd upgrades to simulate the user entering "y". // implicit etcd upgrades to simulate the user entering "y".