Bumping k8s dependencies to 1.13
This commit is contained in:
22
vendor/k8s.io/kubernetes/pkg/volume/scaleio/BUILD
generated
vendored
22
vendor/k8s.io/kubernetes/pkg/volume/scaleio/BUILD
generated
vendored
@@ -18,14 +18,14 @@ go_test(
|
||||
"//pkg/util/mount:go_default_library",
|
||||
"//pkg/volume:go_default_library",
|
||||
"//pkg/volume/testing:go_default_library",
|
||||
"//staging/src/k8s.io/api/core/v1:go_default_library",
|
||||
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
|
||||
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
|
||||
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
|
||||
"//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library",
|
||||
"//staging/src/k8s.io/client-go/util/testing:go_default_library",
|
||||
"//vendor/github.com/codedellemc/goscaleio/types/v1:go_default_library",
|
||||
"//vendor/github.com/golang/glog:go_default_library",
|
||||
"//vendor/k8s.io/api/core/v1:go_default_library",
|
||||
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
|
||||
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
|
||||
"//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
|
||||
"//vendor/k8s.io/client-go/kubernetes/fake:go_default_library",
|
||||
"//vendor/k8s.io/client-go/util/testing:go_default_library",
|
||||
],
|
||||
)
|
||||
|
||||
@@ -45,14 +45,14 @@ go_library(
|
||||
"//pkg/util/strings:go_default_library",
|
||||
"//pkg/volume:go_default_library",
|
||||
"//pkg/volume/util:go_default_library",
|
||||
"//staging/src/k8s.io/api/core/v1:go_default_library",
|
||||
"//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
|
||||
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
|
||||
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
|
||||
"//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
|
||||
"//vendor/github.com/codedellemc/goscaleio:go_default_library",
|
||||
"//vendor/github.com/codedellemc/goscaleio/types/v1:go_default_library",
|
||||
"//vendor/github.com/golang/glog:go_default_library",
|
||||
"//vendor/k8s.io/api/core/v1:go_default_library",
|
||||
"//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
|
||||
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
|
||||
"//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
|
||||
"//vendor/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
|
||||
],
|
||||
)
|
||||
|
||||
|
10
vendor/k8s.io/kubernetes/pkg/volume/scaleio/sio_client.go
generated
vendored
10
vendor/k8s.io/kubernetes/pkg/volume/scaleio/sio_client.go
generated
vendored
@@ -339,10 +339,14 @@ func (c *sioClient) getGuid() (string, error) {
|
||||
func (c *sioClient) getSioDiskPaths() ([]os.FileInfo, error) {
|
||||
files, err := ioutil.ReadDir(sioDiskIDPath)
|
||||
if err != nil {
|
||||
glog.Error(log("failed to ReadDir %s: %v", sioDiskIDPath, err))
|
||||
return nil, err
|
||||
if os.IsNotExist(err) {
|
||||
// sioDiskIDPath may not exist yet which is fine
|
||||
return []os.FileInfo{}, nil
|
||||
} else {
|
||||
glog.Error(log("failed to ReadDir %s: %v", sioDiskIDPath, err))
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
result := []os.FileInfo{}
|
||||
for _, file := range files {
|
||||
if c.diskRegex.MatchString(file.Name()) {
|
||||
|
2
vendor/k8s.io/kubernetes/pkg/volume/scaleio/sio_plugin.go
generated
vendored
2
vendor/k8s.io/kubernetes/pkg/volume/scaleio/sio_plugin.go
generated
vendored
@@ -50,7 +50,7 @@ var _ volume.VolumePlugin = &sioPlugin{}
|
||||
|
||||
func (p *sioPlugin) Init(host volume.VolumeHost) error {
|
||||
p.host = host
|
||||
p.volumeMtx = keymutex.NewKeyMutex()
|
||||
p.volumeMtx = keymutex.NewHashed(0)
|
||||
return nil
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user