Merge pull request kubernetes#74356 from oomichi/golint-e2e-framework-kubemark

Fix golint failures for e2e/[..]/kubemark

Author: k8s-ci-robot

hack/.golint_failures

@@ -650,7 +650,6 @@ test/e2e/chaosmonkey
 test/e2e/common
 test/e2e/framework
 test/e2e/framework/providers/gce
-test/e2e/framework/providers/kubemark
 test/e2e/lifecycle
 test/e2e/lifecycle/bootstrap
 test/e2e/network

test/e2e/framework/providers/kubemark/kubemark.go

@@ -26,36 +26,40 @@ import (
 	"k8s.io/kubernetes/pkg/kubemark"
 	"k8s.io/kubernetes/test/e2e/framework"
 
-	. "github.com/onsi/gomega"
+	"github.com/onsi/gomega"
 )
 
 var (
 	kubemarkExternalKubeConfig = flag.String(fmt.Sprintf("%s-%s", "kubemark-external", clientcmd.RecommendedConfigPathFlag), "", "Path to kubeconfig containing embedded authinfo for external cluster.")
 )
 
 func init() {
-	framework.RegisterProvider("kubemark", NewProvider)
+	framework.RegisterProvider("kubemark", newProvider)
 }
 
-func NewProvider() (framework.ProviderInterface, error) {
+func newProvider() (framework.ProviderInterface, error) {
 	// Actual initialization happens when the e2e framework gets constructed.
 	return &Provider{}, nil
 }
 
+// Provider is a structure to handle Kubemark cluster for e2e testing
 type Provider struct {
 	framework.NullProvider
 	controller   *kubemark.KubemarkController
 	closeChannel chan struct{}
 }
 
+// ResizeGroup resizes an instance group
 func (p *Provider) ResizeGroup(group string, size int32) error {
 	return p.controller.SetNodeGroupSize(group, int(size))
 }
 
+// GetGroupNodes returns a node name for the specified node group
 func (p *Provider) GetGroupNodes(group string) ([]string, error) {
 	return p.controller.GetNodeNamesForNodeGroup(group)
 }
 
+// FrameworkBeforeEach prepares clients, configurations etc. for e2e testing
 func (p *Provider) FrameworkBeforeEach(f *framework.Framework) {
 	if *kubemarkExternalKubeConfig != "" && p.controller == nil {
 		externalConfig, err := clientcmd.BuildConfigFromFlags("", *kubemarkExternalKubeConfig)
@@ -73,11 +77,12 @@ func (p *Provider) FrameworkBeforeEach(f *framework.Framework) {
 		p.controller, err = kubemark.NewKubemarkController(externalClient, externalInformerFactory, f.ClientSet, kubemarkNodeInformer)
 		framework.ExpectNoError(err)
 		externalInformerFactory.Start(p.closeChannel)
-		Expect(p.controller.WaitForCacheSync(p.closeChannel)).To(BeTrue())
+		gomega.Expect(p.controller.WaitForCacheSync(p.closeChannel)).To(gomega.BeTrue())
 		go p.controller.Run(p.closeChannel)
 	}
 }
 
+// FrameworkAfterEach cleans up after e2e testing
 func (p *Provider) FrameworkAfterEach(f *framework.Framework) {
 	if p.closeChannel != nil {
 		close(p.closeChannel)
@@ -86,6 +91,7 @@ func (p *Provider) FrameworkAfterEach(f *framework.Framework) {
 	}
 }
 
+// GroupSize returns the size of an instance group
 func (p *Provider) GroupSize(group string) (int, error) {
 	return p.controller.GetNodeGroupSize(group)
 }