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

Merge pull request #75940 from SataQiu/fix-e2e-framework-20190401

Browse Source 
Fix golint failures of e2e/framework/pods.go, provider.go, upgrade_util.go
This commit is contained in:
Kubernetes Prow Robot 2019-04-01 06:38:46 -07:00 committed by GitHub
commit e9f0d5d546
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/framework/pods.go
View File

@ -38,6 +38,7 @@ import (
"github.com/onsi/gomega" "github.com/onsi/gomega"
) )
// DefaultPodDeletionTimeout is the default timeout for deleting pod
const DefaultPodDeletionTimeout = 3 * time.Minute const DefaultPodDeletionTimeout = 3 * time.Minute
// ImageWhiteList is the images used in the current test suite. It should be initialized in test suite and // ImageWhiteList is the images used in the current test suite. It should be initialized in test suite and

2
test/e2e/framework/provider.go
View File

@ -129,7 +129,7 @@ func (n NullProvider) GetGroupNodes(group string) ([]string, error) {
return nil, fmt.Errorf("provider does not support InstanceGroups") 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) { func (n NullProvider) GroupSize(group string) (int, error) {
return -1, fmt.Errorf("provider does not support InstanceGroups") return -1, fmt.Errorf("provider does not support InstanceGroups")
} }

2
test/e2e/framework/upgrade_util.go
View File

@ -57,6 +57,7 @@ func traceRouteToMaster() {
} }
} }
// CheckMasterVersion validates the master version
func CheckMasterVersion(c clientset.Interface, want string) error { func CheckMasterVersion(c clientset.Interface, want string) error {
Logf("Checking master version") Logf("Checking master version")
var err error var err error
@ -84,6 +85,7 @@ func CheckMasterVersion(c clientset.Interface, want string) error {
return nil return nil
} }
// CheckNodesVersions validates the nodes versions
func CheckNodesVersions(cs clientset.Interface, want string) error { func CheckNodesVersions(cs clientset.Interface, want string) error {
l := GetReadySchedulableNodesOrDie(cs) l := GetReadySchedulableNodesOrDie(cs)
for _, n := range l.Items { for _, n := range l.Items {