Skip to content

Commit 48d9874

Browse files
authored
Merge pull request #98 from andyzhangx/update-cloud-provider
chore: update azure cloud provider
2 parents 078703a + 16f4a77 commit 48d9874

File tree

902 files changed

+135274
-88447
lines changed

Some content is hidden

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

902 files changed

+135274
-88447
lines changed

Gopkg.lock

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

Gopkg.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@
3434
#revision = "5b1e3786b7c8f7ca514b40e882a0b5dc36e4c842"
3535
version = "v1.1.0"
3636

37-
[[override]]
38-
revision = "5db89f0ca68677abc5eefce8f2a0a772c98ba52d"
39-
name = "github.com/docker/distribution"
40-
4137
[[constraint]]
4238
name = "github.com/pborman/uuid"
4339
version = "1.1.0"
@@ -100,7 +96,7 @@
10096

10197
[[override]]
10298
name = "github.com/Azure/azure-sdk-for-go"
103-
version = "v21.3.0"
99+
version = "v35.0.0"
104100

105101
[[override]]
106102
name = "github.com/kubernetes-csi/external-snapshotter"
@@ -109,3 +105,7 @@
109105
[[override]]
110106
name = "github.com/prometheus/client_golang"
111107
version = "=v1.0.0"
108+
109+
[[constraint]]
110+
branch = "master"
111+
name = "k8s.io/legacy-cloud-providers"

pkg/blobfuse/azure.go

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,7 @@ func GetCloudProvider() (*azureprovider.Cloud, error) {
4949
}
5050
defer f.Close()
5151

52-
cloud, err := azureprovider.NewCloud(f)
53-
if err != nil {
54-
return nil, err
55-
}
56-
57-
az, ok := cloud.(*azureprovider.Cloud)
58-
if !ok || az == nil {
59-
return nil, fmt.Errorf("failed to get Azure Cloud Provider. GetCloudProvider returned %v instead", cloud)
60-
}
61-
return az, nil
52+
return azureprovider.NewCloudWithoutFeatureGates(f)
6253
}
6354

6455
// getKeyVaultSecretContent get content of the keyvault secret

pkg/blobfuse/controllerserver.go

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

2424
"sigs.k8s.io/blobfuse-csi-driver/pkg/util"
2525

26-
"github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2018-07-01/storage"
26+
"github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-06-01/storage"
2727
azstorage "github.com/Azure/azure-sdk-for-go/storage"
2828
"github.com/container-storage-interface/spec/lib/go/csi"
2929
"google.golang.org/grpc/codes"

vendor/contrib.go.opencensus.io/exporter/ocagent/LICENSE

Lines changed: 0 additions & 201 deletions
This file was deleted.

vendor/contrib.go.opencensus.io/exporter/ocagent/common.go

Lines changed: 0 additions & 38 deletions
This file was deleted.

vendor/contrib.go.opencensus.io/exporter/ocagent/connection.go

Lines changed: 0 additions & 97 deletions
This file was deleted.

0 commit comments

Comments
 (0)