Skip to content

K
k3s
Commit 6941925c authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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.
parents a1b9905c 3e470138
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
test/e2e/framework/nodes_util.go
View file @ 6941925c
...@@ -30,9 +30,7 @@ import ( ...@@ -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 { ...@@ -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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment