github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Fix golint failures for e2e/[..]/kubemark
This commit is contained in:
Kubernetes Prow Robot 2019-03-21 19:26:32 -07:00 committed by GitHub
commit c48ed1c5ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/.golint_failures
View File

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

14
test/e2e/framework/providers/kubemark/kubemark.go
View File

@ -26,7 +26,7 @@ import (
"k8s.io/kubernetes/pkg/kubemark" "k8s.io/kubernetes/pkg/kubemark"
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
. "github.com/onsi/gomega" "github.com/onsi/gomega"
) )
var ( var (
@ -34,28 +34,32 @@ var (
) )
func init() { 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. // Actual initialization happens when the e2e framework gets constructed.
return &Provider{}, nil return &Provider{}, nil
} }
// Provider is a structure to handle Kubemark cluster for e2e testing
type Provider struct { type Provider struct {
framework.NullProvider framework.NullProvider
controller *kubemark.KubemarkController controller *kubemark.KubemarkController
closeChannel chan struct{} closeChannel chan struct{}
} }
// ResizeGroup resizes an instance group
func (p *Provider) ResizeGroup(group string, size int32) error { func (p *Provider) ResizeGroup(group string, size int32) error {
return p.controller.SetNodeGroupSize(group, int(size)) 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) { func (p *Provider) GetGroupNodes(group string) ([]string, error) {
return p.controller.GetNodeNamesForNodeGroup(group) return p.controller.GetNodeNamesForNodeGroup(group)
} }
// FrameworkBeforeEach prepares clients, configurations etc. for e2e testing
func (p *Provider) FrameworkBeforeEach(f *framework.Framework) { func (p *Provider) FrameworkBeforeEach(f *framework.Framework) {
if *kubemarkExternalKubeConfig != "" && p.controller == nil { if *kubemarkExternalKubeConfig != "" && p.controller == nil {
externalConfig, err := clientcmd.BuildConfigFromFlags("", *kubemarkExternalKubeConfig) 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) p.controller, err = kubemark.NewKubemarkController(externalClient, externalInformerFactory, f.ClientSet, kubemarkNodeInformer)
framework.ExpectNoError(err) framework.ExpectNoError(err)
externalInformerFactory.Start(p.closeChannel) 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) go p.controller.Run(p.closeChannel)
} }
} }
// FrameworkAfterEach cleans up after e2e testing
func (p *Provider) FrameworkAfterEach(f *framework.Framework) { func (p *Provider) FrameworkAfterEach(f *framework.Framework) {
if p.closeChannel != nil { if p.closeChannel != nil {
close(p.closeChannel) 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) { func (p *Provider) GroupSize(group string) (int, error) {
return p.controller.GetNodeGroupSize(group) return p.controller.GetNodeGroupSize(group)
} }