Skip to content

Commit 6c03fd8

Browse files
andyzhangxandyzhangx
authored
Merge pull request #40 from csi-driver/upgrade-1.15.0
chore: upgrade to k8s 1.15.0
2 parents d887ddf + 3f56002 commit 6c03fd8

File tree

660 files changed

+108972
-138037
lines changed

Some content is hidden

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

660 files changed

+108972
-138037
lines changed

‎Gopkg.lock

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

‎Gopkg.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131

3232
[[constraint]]
3333
name = "github.com/kubernetes-csi/csi-test"
34-
revision = "5b1e3786b7c8f7ca514b40e882a0b5dc36e4c842"
35-
#version = "v1.1.0"
34+
#revision = "5b1e3786b7c8f7ca514b40e882a0b5dc36e4c842"
35+
version = "v1.1.0"
3636

3737
[[override]]
3838
revision = "5db89f0ca68677abc5eefce8f2a0a772c98ba52d"
@@ -56,34 +56,34 @@
5656

5757
[[constraint]]
5858
name = "k8s.io/kubernetes"
59-
version = "v1.14.0"
59+
version = "v1.15.0"
6060

6161
[[override]]
6262
name = "gopkg.in/fsnotify.v1"
6363
source = "https://github.com/fsnotify/fsnotify.git"
6464

6565
[[override]]
66-
version = "kubernetes-1.14.0"
66+
version = "kubernetes-1.15.0"
6767
name = "k8s.io/api"
6868

6969
[[override]]
70-
version = "kubernetes-1.14.0"
70+
version = "kubernetes-1.15.0"
7171
name = "k8s.io/apiserver"
7272

7373
[[override]]
74-
version = "kubernetes-1.14.0"
74+
version = "kubernetes-1.15.0"
7575
name = "k8s.io/apiextensions-apiserver"
7676

7777
[[override]]
78-
version = "kubernetes-1.14.0"
78+
version = "kubernetes-1.15.0"
7979
name = "k8s.io/client-go"
8080

8181
[[override]]
82-
version = "kubernetes-1.14.0"
82+
version = "kubernetes-1.15.0"
8383
name = "k8s.io/apimachinery"
8484

8585
[[override]]
86-
version = "kubernetes-1.14.0"
86+
version = "kubernetes-1.15.0"
8787
name = "k8s.io/cli-runtime"
8888

8989
[[override]]

‎pkg/blobfuse/azure.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"os"
2222

2323
"k8s.io/klog"
24-
"k8s.io/kubernetes/pkg/cloudprovider/providers/azure"
24+
"k8s.io/legacy-cloud-providers/azure"
2525
)
2626

2727
// GetCloudProvider get Azure Cloud Provider

‎pkg/blobfuse/blobfuse.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ import (
2020
"fmt"
2121
"strings"
2222

23-
"k8s.io/kubernetes/pkg/cloudprovider/providers/azure"
24-
"k8s.io/kubernetes/pkg/util/mount"
25-
2623
"github.com/container-storage-interface/spec/lib/go/csi"
2724
csicommon "github.com/csi-driver/blobfuse-csi-driver/pkg/csi-common"
25+
2826
"k8s.io/klog"
27+
"k8s.io/kubernetes/pkg/util/mount"
28+
"k8s.io/legacy-cloud-providers/azure"
2929
)
3030

3131
const (

‎vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-10-01/compute/availabilitysets.go renamed to ‎vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute/availabilitysets.go

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

‎vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-10-01/compute/client.go renamed to ‎vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute/client.go

File renamed without changes.

‎vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-10-01/compute/containerservices.go renamed to ‎vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute/containerservices.go

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

‎vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-10-01/compute/disks.go renamed to ‎vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute/disks.go

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

‎vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-10-01/compute/galleries.go renamed to ‎vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute/galleries.go

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

0 commit comments

Comments
 (0)