mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 11:50:44 +00:00
Merge pull request #75940 from SataQiu/fix-e2e-framework-20190401
Fix golint failures of e2e/framework/pods.go, provider.go, upgrade_util.go
This commit is contained in:
commit
e9f0d5d546
@ -38,6 +38,7 @@ import (
|
||||
"github.com/onsi/gomega"
|
||||
)
|
||||
|
||||
// DefaultPodDeletionTimeout is the default timeout for deleting pod
|
||||
const DefaultPodDeletionTimeout = 3 * time.Minute
|
||||
|
||||
// ImageWhiteList is the images used in the current test suite. It should be initialized in test suite and
|
||||
|
@ -129,7 +129,7 @@ func (n NullProvider) GetGroupNodes(group string) ([]string, error) {
|
||||
return nil, fmt.Errorf("provider does not support InstanceGroups")
|
||||
}
|
||||
|
||||
// DeleteNode is a base implementation which returns group size.
|
||||
// GroupSize returns the size of an instance group
|
||||
func (n NullProvider) GroupSize(group string) (int, error) {
|
||||
return -1, fmt.Errorf("provider does not support InstanceGroups")
|
||||
}
|
||||
|
@ -57,6 +57,7 @@ func traceRouteToMaster() {
|
||||
}
|
||||
}
|
||||
|
||||
// CheckMasterVersion validates the master version
|
||||
func CheckMasterVersion(c clientset.Interface, want string) error {
|
||||
Logf("Checking master version")
|
||||
var err error
|
||||
@ -84,6 +85,7 @@ func CheckMasterVersion(c clientset.Interface, want string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// CheckNodesVersions validates the nodes versions
|
||||
func CheckNodesVersions(cs clientset.Interface, want string) error {
|
||||
l := GetReadySchedulableNodesOrDie(cs)
|
||||
for _, n := range l.Items {
|
||||
|
Loading…
Reference in New Issue
Block a user