Merge pull request kubernetes#74586 from danielqsj/patch3

fix golint failures for test/e2e/cloud|kubectl|servicecatalog

Author: k8s-ci-robot

hack/.golint_failures

@@ -650,22 +650,19 @@ test/e2e/apps
 test/e2e/auth
 test/e2e/autoscaling
 test/e2e/chaosmonkey
-test/e2e/cloud
 test/e2e/common
 test/e2e/framework
 test/e2e/framework/providers/gce
 test/e2e/framework/providers/kubemark
 test/e2e/instrumentation
 test/e2e/instrumentation/logging
 test/e2e/instrumentation/monitoring
-test/e2e/kubectl
 test/e2e/lifecycle
 test/e2e/lifecycle/bootstrap
 test/e2e/network
 test/e2e/node
 test/e2e/scalability
 test/e2e/scheduling
-test/e2e/servicecatalog
 test/e2e/storage
 test/e2e/storage/drivers
 test/e2e/storage/testsuites

test/e2e/cloud/framework.go

@@ -18,6 +18,7 @@ package cloud
 
 import "k8s.io/kubernetes/test/e2e/framework"
 
+// SIGDescribe annotates the test with the SIG label.
 func SIGDescribe(text string, body func()) bool {
 	return framework.KubeDescribe("[sig-cloud-provider] "+text, body)
 }

test/e2e/cloud/nodes.go

@@ -24,23 +24,23 @@ import (
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/kubernetes/test/e2e/framework"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	"github.com/onsi/ginkgo"
+	"github.com/onsi/gomega"
 )
 
 var _ = SIGDescribe("[Feature:CloudProvider][Disruptive] Nodes", func() {
 	f := framework.NewDefaultFramework("cloudprovider")
 	var c clientset.Interface
 
-	BeforeEach(func() {
+	ginkgo.BeforeEach(func() {
 		// Only supported in AWS/GCE because those are the only cloud providers
 		// where E2E test are currently running.
 		framework.SkipUnlessProviderIs("aws", "gce", "gke")
 		c = f.ClientSet
 	})
 
-	It("should be deleted on API server if it doesn't exist in the cloud provider", func() {
-		By("deleting a node on the cloud provider")
+	ginkgo.It("should be deleted on API server if it doesn't exist in the cloud provider", func() {
+		ginkgo.By("deleting a node on the cloud provider")
 
 		nodeDeleteCandidates := framework.GetReadySchedulableNodesOrDie(c)
 		nodeToDelete := nodeDeleteCandidates.Items[0]
@@ -54,8 +54,8 @@ var _ = SIGDescribe("[Feature:CloudProvider][Disruptive] Nodes", func() {
 		}
 
 		newNodes, err := framework.CheckNodesReady(c, len(origNodes.Items)-1, 5*time.Minute)
-		Expect(err).To(BeNil())
-		Expect(len(newNodes)).To(Equal(len(origNodes.Items) - 1))
+		gomega.Expect(err).To(gomega.BeNil())
+		gomega.Expect(len(newNodes)).To(gomega.Equal(len(origNodes.Items) - 1))
 
 		_, err = c.CoreV1().Nodes().Get(nodeToDelete.Name, metav1.GetOptions{})
 		if err == nil {

test/e2e/kubectl/framework.go

@@ -18,6 +18,7 @@ package kubectl
 
 import "github.com/onsi/ginkgo"
 
+// SIGDescribe annotates the test with the SIG label.
 func SIGDescribe(text string, body func()) bool {
 	return ginkgo.Describe("[sig-cli] "+text, body)
 }