Merge pull request #41167 from mml/funk

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

View File

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