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

Merge pull request #41167 from mml/funk

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 41074, 41147, 40854, 41167, 40045)

Fix some funky funcs.

This is code cleanup.  Fix function declarations and remove stale comment.
This commit is contained in:
Kubernetes Submit Queue 2017-02-09 17:41:44 -08:00 committed by GitHub
commit 6941925cb7
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,9 +30,7 @@ import (
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
) )
// The following upgrade functions are passed into the framework below and used func MasterUpgrade(v string) error {
// to do the actual upgrades.
var MasterUpgrade = func(v string) error {
switch TestContext.Provider { switch TestContext.Provider {
case "gce": case "gce":
return masterUpgradeGCE(v) return masterUpgradeGCE(v)
@ -63,7 +61,7 @@ func masterUpgradeGKE(v string) error {
return err return err
} }
var NodeUpgrade = func(f *Framework, v string, img string) error { func NodeUpgrade(f *Framework, v string, img string) error {
// Perform the upgrade. // Perform the upgrade.
var err error var err error
switch TestContext.Provider { switch TestContext.Provider {