From 1fcab198218af6883b652b116959055fb774e3eb Mon Sep 17 00:00:00 2001 From: Kenichi Omichi Date: Thu, 21 Feb 2019 16:41:28 +0000 Subject: [PATCH] Fix golint failures for e2e/[..]/kubemark --- hack/.golint_failures | 1 - test/e2e/framework/providers/kubemark/kubemark.go | 14 ++++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/hack/.golint_failures b/hack/.golint_failures index c6f0382aca3..d2ea81d9269 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -637,7 +637,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 diff --git a/test/e2e/framework/providers/kubemark/kubemark.go b/test/e2e/framework/providers/kubemark/kubemark.go index 0c5a8960586..52dde1e5ae7 100644 --- a/test/e2e/framework/providers/kubemark/kubemark.go +++ b/test/e2e/framework/providers/kubemark/kubemark.go @@ -26,7 +26,7 @@ import ( "k8s.io/kubernetes/pkg/kubemark" "k8s.io/kubernetes/test/e2e/framework" - . "github.com/onsi/gomega" + "github.com/onsi/gomega" ) var ( @@ -34,28 +34,32 @@ var ( ) 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) }