8000 Merge pull request #69718 from andyzhangx/azurefile-premium · kubernetes/kubernetes@b5c2572 · GitHub
[go: up one dir, main page]
Skip to content

Commit b5c2572

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #69718 from andyzhangx/azurefile-premium
support Azure premium file for azure file plugin
2 parents 0ab29b4 + bc2c79a commit b5c2572

File tree

41 files changed

+3221
-377
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+3221
-377
lines changed

‎Godeps/Godeps.json

Lines changed: 32 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Godeps/LICENSES

Lines changed: 200 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/cloudprovider/providers/azure/BUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ go_library(
6060
"//staging/src/k8s.io/cloud-provider:go_default_library",
6161
"//vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-04-01/compute:go_default_library",
6262
"//vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network:go_default_library",
63-
"//vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2017-10-01/storage:go_default_library",
63+
"//vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2018-07-01/storage:go_default_library",
6464
"//vendor/github.com/Azure/azure-sdk-for-go/storage:go_default_library",
6565
"//vendor/github.com/Azure/go-autorest/autorest:go_default_library",
6666
"//vendor/github.com/Azure/go-autorest/autorest/adal:go_default_library",
@@ -103,7 +103,7 @@ go_test(
103103
"//staging/src/k8s.io/cloud-provider:go_default_library",
104104
"//vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-04-01/compute:go_default_library",
105105
"//vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network:go_default_library",
106-
"//vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2017-10-01/storage:go_default_library",
106+
"//vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2018-07-01/storage:go_default_library",
107107
"//vendor/github.com/Azure/go-autorest/autorest:go_default_library",
108108
"//vendor/github.com/Azure/go-autorest/autorest/to:go_default_library",
109109
"//vendor/github.com/stretchr/testify/assert:go_default_library",

‎pkg/cloudprovider/providers/azure/azure_blobDiskController.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"sync/atomic"
2828
"time"
2929

30-
"github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2017-10-01/storage"
30+
"github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2018-07-01/storage"
3131
azstorage "github.com/Azure/azure-sdk-for-go/storage"
3232
"github.com/Azure/go-autorest/autorest/to"
3333
"github.com/golang/glog"
@@ -80,7 +80,7 @@ func newBlobDiskController(common *controllerCommon) (*BlobDiskController, error
8080
// If no storage account is given, search all the storage accounts associated with the resource group and pick one that
8181
// fits storage type and location.
8282
func (c *BlobDiskController) CreateVolume(blobName, accountName, accountType, location string, requestGB int) (string, string, int, error) {
83-
account, key, err := c.common.cloud.ensureStorageAccount(accountName, accountType, c.common.resourceGroup, location, dedicatedDiskAccountNamePrefix)
83+
account, key, err := c.common.cloud.ensureStorageAccount(accountName, accountType, string(defaultStorageAccountKind), c.common.resourceGroup, location, dedicatedDiskAccountNamePrefix)
8484
if err != nil {
8585
return "", "", 0, fmt.Errorf("could not get storage key for storage account %s: %v", accountName, err)
8686
}
@@ -491,7 +491,7 @@ func (c *BlobDiskController) createStorageAccount(storageAccountName string, sto
491491
cp := storage.AccountCreateParameters{
492492
Sku: &storage.Sku{Name: storageAccountType},
493493
// switch to use StorageV2 as it's recommended according to https://docs.microsoft.com/en-us/azure/storage/common/storage-account-options
494-
Kind: storage.StorageV2,
494+
Kind: defaultStorageAccountKind,
495495
Tags: map[string]*string{"created-by": to.StringPtr("azure-dd")},
496496
Location: &location}
497497
ctx, cancel := getContextWithCancel()

‎pkg/cloudprovider/providers/azure/azure_client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424

2525
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-04-01/compute"
2626
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network"
27-
"github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2017-10-01/storage"
27+
"github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2018-07-01/storage"
2828
"github.com/Azure/go-autorest/autorest"
2929
"github.com/Azure/go-autorest/autorest/adal"
3030
"github.com/golang/glog"

‎pkg/cloudprovider/providers/azure/azure_fakes.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131

3232
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-04-01/compute"
3333
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network"
34-
"github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2017-10-01/storage"
34+
"github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2018-07-01/storage"
3535
"github.com/Azure/go-autorest/autorest"
3636
"github.com/Azure/go-autorest/autorest/to"
3737
)

0 commit comments

Comments
 (0)
0