mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-09-23 02:47:57 +00:00
Add storage tests for Azure File in-tree storage plugin
This commit is contained in:
@@ -26,7 +26,7 @@ import (
|
||||
"github.com/aws/aws-sdk-go/service/autoscaling"
|
||||
"github.com/aws/aws-sdk-go/service/ec2"
|
||||
|
||||
"k8s.io/api/core/v1"
|
||||
v1 "k8s.io/api/core/v1"
|
||||
"k8s.io/kubernetes/test/e2e/framework"
|
||||
e2epv "k8s.io/kubernetes/test/e2e/framework/pv"
|
||||
awscloud "k8s.io/legacy-cloud-providers/aws"
|
||||
@@ -93,6 +93,14 @@ func (p *Provider) DeleteNode(node *v1.Node) error {
|
||||
return err
|
||||
}
|
||||
|
||||
func (p *Provider) CreateShare() (string, string, error) {
|
||||
return "", "", nil
|
||||
}
|
||||
|
||||
func (p *Provider) DeleteShare(accountName, shareName string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// CreatePD creates a persistent volume on the specified availability zone
|
||||
func (p *Provider) CreatePD(zone string) (string, error) {
|
||||
client := newAWSClient(zone)
|
||||
|
@@ -27,6 +27,7 @@ import (
|
||||
"k8s.io/apimachinery/pkg/util/uuid"
|
||||
"k8s.io/kubernetes/test/e2e/framework"
|
||||
"k8s.io/legacy-cloud-providers/azure"
|
||||
"k8s.io/legacy-cloud-providers/azure/clients/fileclient"
|
||||
)
|
||||
|
||||
func init() {
|
||||
@@ -84,6 +85,36 @@ func (p *Provider) CreatePD(zone string) (string, error) {
|
||||
return p.azureCloud.CreateManagedDisk(volumeOptions)
|
||||
}
|
||||
|
||||
// CreateShare creates a share and return its account name and key.
|
||||
func (p *Provider) CreateShare() (string, string, error) {
|
||||
accountOptions := &azure.AccountOptions{
|
||||
Name: "",
|
||||
Type: string(compute.StandardLRS),
|
||||
ResourceGroup: p.azureCloud.ResourceGroup,
|
||||
Location: p.azureCloud.GetLocation(),
|
||||
EnableHTTPSTrafficOnly: true,
|
||||
Tags: nil,
|
||||
VirtualNetworkResourceIDs: nil,
|
||||
}
|
||||
|
||||
shareOptions := &fileclient.ShareOptions{
|
||||
Name: fmt.Sprintf("%s-%s", framework.TestContext.Prefix, string(uuid.NewUUID())),
|
||||
RequestGiB: 1,
|
||||
}
|
||||
|
||||
a, b, c := p.azureCloud.CreateFileShare(accountOptions, shareOptions)
|
||||
|
||||
return a, b, c
|
||||
}
|
||||
|
||||
func (p *Provider) DeleteShare(accountName, shareName string) error {
|
||||
err := p.azureCloud.DeleteFileShare("", accountName, shareName)
|
||||
if err != nil {
|
||||
framework.Logf("failed to delete Azure File share %q: %v", shareName, err)
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
// DeletePD deletes a persistent volume
|
||||
func (p *Provider) DeletePD(pdName string) error {
|
||||
if err := p.azureCloud.DeleteManagedDisk(pdName); err != nil {
|
||||
|
@@ -225,6 +225,14 @@ func (p *Provider) DeleteNode(node *v1.Node) error {
|
||||
return p.gceCloud.DeleteInstance(project, zone, node.Name)
|
||||
}
|
||||
|
||||
func (p *Provider) CreateShare() (string, string, error) {
|
||||
return "", "", nil
|
||||
}
|
||||
|
||||
func (p *Provider) DeleteShare(accountName, shareName string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// CreatePD creates a persistent volume
|
||||
func (p *Provider) CreatePD(zone string) (string, error) {
|
||||
pdName := fmt.Sprintf("%s-%s", framework.TestContext.Prefix, string(uuid.NewUUID()))
|
||||
|
Reference in New Issue
Block a user