mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 04:33:26 +00:00
Fix golint failures on e2e/[..]/(aws|azure)
This commit is contained in:
parent
21e3c15dfe
commit
36b80a4c61
@ -674,8 +674,6 @@ test/e2e/cloud
|
|||||||
test/e2e/common
|
test/e2e/common
|
||||||
test/e2e/framework
|
test/e2e/framework
|
||||||
test/e2e/framework/ingress
|
test/e2e/framework/ingress
|
||||||
test/e2e/framework/providers/aws
|
|
||||||
test/e2e/framework/providers/azure
|
|
||||||
test/e2e/framework/providers/gce
|
test/e2e/framework/providers/gce
|
||||||
test/e2e/framework/providers/kubemark
|
test/e2e/framework/providers/kubemark
|
||||||
test/e2e/instrumentation
|
test/e2e/instrumentation
|
||||||
|
@ -32,25 +32,28 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
framework.RegisterProvider("aws", NewProvider)
|
framework.RegisterProvider("aws", newProvider)
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewProvider() (framework.ProviderInterface, error) {
|
func newProvider() (framework.ProviderInterface, error) {
|
||||||
if framework.TestContext.CloudConfig.Zone == "" {
|
if framework.TestContext.CloudConfig.Zone == "" {
|
||||||
return nil, fmt.Errorf("gce-zone must be specified for AWS")
|
return nil, fmt.Errorf("gce-zone must be specified for AWS")
|
||||||
}
|
}
|
||||||
return &Provider{}, nil
|
return &Provider{}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Provider is a structure to handle AWS clouds for e2e testing
|
||||||
type Provider struct {
|
type Provider struct {
|
||||||
framework.NullProvider
|
framework.NullProvider
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ResizeGroup resizes an instance group
|
||||||
func (p *Provider) ResizeGroup(group string, size int32) error {
|
func (p *Provider) ResizeGroup(group string, size int32) error {
|
||||||
client := autoscaling.New(session.New())
|
client := autoscaling.New(session.New())
|
||||||
return awscloud.ResizeInstanceGroup(client, group, int(size))
|
return awscloud.ResizeInstanceGroup(client, group, int(size))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GroupSize returns the size of an instance group
|
||||||
func (p *Provider) GroupSize(group string) (int, error) {
|
func (p *Provider) GroupSize(group string) (int, error) {
|
||||||
client := autoscaling.New(session.New())
|
client := autoscaling.New(session.New())
|
||||||
instanceGroup, err := awscloud.DescribeInstanceGroup(client, group)
|
instanceGroup, err := awscloud.DescribeInstanceGroup(client, group)
|
||||||
@ -63,6 +66,7 @@ func (p *Provider) GroupSize(group string) (int, error) {
|
|||||||
return instanceGroup.CurrentSize()
|
return instanceGroup.CurrentSize()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// DeleteNode deletes a node which is specified as the argument
|
||||||
func (p *Provider) DeleteNode(node *v1.Node) error {
|
func (p *Provider) DeleteNode(node *v1.Node) error {
|
||||||
client := newAWSClient("")
|
client := newAWSClient("")
|
||||||
|
|
||||||
@ -80,6 +84,7 @@ func (p *Provider) DeleteNode(node *v1.Node) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// CreatePD creates a persistent volume on the specified availability zone
|
||||||
func (p *Provider) CreatePD(zone string) (string, error) {
|
func (p *Provider) CreatePD(zone string) (string, error) {
|
||||||
client := newAWSClient(zone)
|
client := newAWSClient(zone)
|
||||||
request := &ec2.CreateVolumeInput{}
|
request := &ec2.CreateVolumeInput{}
|
||||||
@ -98,6 +103,7 @@ func (p *Provider) CreatePD(zone string) (string, error) {
|
|||||||
return volumeName, nil
|
return volumeName, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// DeletePD deletes a persistent volume
|
||||||
func (p *Provider) DeletePD(pdName string) error {
|
func (p *Provider) DeletePD(pdName string) error {
|
||||||
client := newAWSClient("")
|
client := newAWSClient("")
|
||||||
|
|
||||||
@ -116,6 +122,7 @@ func (p *Provider) DeletePD(pdName string) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// CreatePVSource creates a persistent volume source
|
||||||
func (p *Provider) CreatePVSource(zone, diskName string) (*v1.PersistentVolumeSource, error) {
|
func (p *Provider) CreatePVSource(zone, diskName string) (*v1.PersistentVolumeSource, error) {
|
||||||
return &v1.PersistentVolumeSource{
|
return &v1.PersistentVolumeSource{
|
||||||
AWSElasticBlockStore: &v1.AWSElasticBlockStoreVolumeSource{
|
AWSElasticBlockStore: &v1.AWSElasticBlockStoreVolumeSource{
|
||||||
@ -125,6 +132,7 @@ func (p *Provider) CreatePVSource(zone, diskName string) (*v1.PersistentVolumeSo
|
|||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// DeletePVSource deletes a persistent volume source
|
||||||
func (p *Provider) DeletePVSource(pvSource *v1.PersistentVolumeSource) error {
|
func (p *Provider) DeletePVSource(pvSource *v1.PersistentVolumeSource) error {
|
||||||
return framework.DeletePDWithRetry(pvSource.AWSElasticBlockStore.VolumeID)
|
return framework.DeletePDWithRetry(pvSource.AWSElasticBlockStore.VolumeID)
|
||||||
}
|
}
|
||||||
|
@ -28,10 +28,10 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
framework.RegisterProvider("azure", NewProvider)
|
framework.RegisterProvider("azure", newProvider)
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewProvider() (framework.ProviderInterface, error) {
|
func newProvider() (framework.ProviderInterface, error) {
|
||||||
if framework.TestContext.CloudConfig.ConfigFile == "" {
|
if framework.TestContext.CloudConfig.ConfigFile == "" {
|
||||||
return nil, fmt.Errorf("config-file must be specified for Azure")
|
return nil, fmt.Errorf("config-file must be specified for Azure")
|
||||||
}
|
}
|
||||||
@ -47,16 +47,19 @@ func NewProvider() (framework.ProviderInterface, error) {
|
|||||||
}, err
|
}, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//Provider is a structure to handle Azure clouds for e2e testing
|
||||||
type Provider struct {
|
type Provider struct {
|
||||||
framework.NullProvider
|
framework.NullProvider
|
||||||
|
|
||||||
azureCloud *azure.Cloud
|
azureCloud *azure.Cloud
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// DeleteNode deletes a node which is specified as the argument
|
||||||
func (p *Provider) DeleteNode(node *v1.Node) error {
|
func (p *Provider) DeleteNode(node *v1.Node) error {
|
||||||
return errors.New("not implemented yet")
|
return errors.New("not implemented yet")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// CreatePD creates a persistent volume
|
||||||
func (p *Provider) CreatePD(zone string) (string, error) {
|
func (p *Provider) CreatePD(zone string) (string, error) {
|
||||||
pdName := fmt.Sprintf("%s-%s", framework.TestContext.Prefix, string(uuid.NewUUID()))
|
pdName := fmt.Sprintf("%s-%s", framework.TestContext.Prefix, string(uuid.NewUUID()))
|
||||||
_, diskURI, _, err := p.azureCloud.CreateVolume(pdName, "" /* account */, "" /* sku */, "" /* location */, 1 /* sizeGb */)
|
_, diskURI, _, err := p.azureCloud.CreateVolume(pdName, "" /* account */, "" /* sku */, "" /* location */, 1 /* sizeGb */)
|
||||||
@ -66,6 +69,7 @@ func (p *Provider) CreatePD(zone string) (string, error) {
|
|||||||
return diskURI, nil
|
return diskURI, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// DeletePD deletes a persistent volume
|
||||||
func (p *Provider) DeletePD(pdName string) error {
|
func (p *Provider) DeletePD(pdName string) error {
|
||||||
if err := p.azureCloud.DeleteVolume(pdName); err != nil {
|
if err := p.azureCloud.DeleteVolume(pdName); err != nil {
|
||||||
framework.Logf("failed to delete Azure volume %q: %v", pdName, err)
|
framework.Logf("failed to delete Azure volume %q: %v", pdName, err)
|
||||||
@ -74,6 +78,7 @@ func (p *Provider) DeletePD(pdName string) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// EnableAndDisableInternalLB returns functions for both enabling and disabling internal Load Balancer
|
||||||
func (p *Provider) EnableAndDisableInternalLB() (enable, disable func(svc *v1.Service)) {
|
func (p *Provider) EnableAndDisableInternalLB() (enable, disable func(svc *v1.Service)) {
|
||||||
enable = func(svc *v1.Service) {
|
enable = func(svc *v1.Service) {
|
||||||
svc.ObjectMeta.Annotations = map[string]string{azure.ServiceAnnotationLoadBalancerInternal: "true"}
|
svc.ObjectMeta.Annotations = map[string]string{azure.ServiceAnnotationLoadBalancerInternal: "true"}
|
||||||
|
Loading…
Reference in New Issue
Block a user