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

Move RestartApiserver() into e2e/network

Browse Source 
The function is called from e2e/network test only, so this moves
the function into the test for reducing e2e/framework/util.go code
and removing invalid dependency on e2e test framework.
This commit is contained in:
Kenichi Omichi
2020-03-24 20:59:08 +00:00
parent 0f1a27bcee
commit 7398c83afd
3 changed files with 87 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,7 +52,7 @@ func MasterUpgrade(f *Framework, v string) error {
case "gce":
return masterUpgradeGCE(v, false)
case "gke":
return masterUpgradeGKE(f.Namespace.Name, v)
return MasterUpgradeGKE(f.Namespace.Name, v)
case "kubernetes-anywhere":
return masterUpgradeKubernetesAnywhere(v)
default:
@@ -113,7 +113,8 @@ func appendContainerCommandGroupIfNeeded(args []string) []string {
return args
}
func masterUpgradeGKE(namespace string, v string) error {
// MasterUpgradeGKE upgrades master node to the specified version on GKE.
func MasterUpgradeGKE(namespace string, v string) error {
Logf("Upgrading master to %q", v)
args := []string{
"container",