Skip to content

Commit bad0b13

Browse files
adiskyk8s-ci-robot
authored andcommitted
Update k/k v1.16 (#769)
This PR updates all dependencies to k/k v1.16
1 parent fb70e41 commit bad0b13

File tree

6 files changed

+121
-51
lines changed

6 files changed

+121
-51
lines changed

Gopkg.lock

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

Gopkg.toml

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,39 +54,39 @@
5454

5555
[[override]]
5656
name = "k8s.io/api"
57-
version = "kubernetes-1.16.0-beta.1"
57+
version = "kubernetes-1.16.0"
5858

5959
[[constraint]]
6060
name = "k8s.io/apimachinery"
61-
version = "kubernetes-1.16.0-beta.1"
61+
version = "kubernetes-1.16.0"
6262

6363
[[constraint]]
6464
name = "k8s.io/apiserver"
65-
version = "kubernetes-1.16.0-beta.1"
65+
version = "kubernetes-1.16.0"
6666

6767
[[constraint]]
6868
name = "k8s.io/client-go"
69-
version = "kubernetes-1.16.0-beta.1"
69+
version = "kubernetes-1.16.0"
7070

7171
[[constraint]]
7272
name = "k8s.io/cloud-provider"
73-
version = "kubernetes-1.16.0-beta.1"
73+
version = "kubernetes-1.16.0"
7474

7575
[[constraint]]
7676
name = "k8s.io/component-base"
77-
version = "kubernetes-1.16.0-beta.1"
77+
version = "kubernetes-1.16.0"
7878

7979
[[override]]
8080
name = "k8s.io/kube-controller-manager"
81-
version = "kubernetes-1.16.0-beta.1"
81+
version = "kubernetes-1.16.0"
8282

8383
[[override]]
8484
name = "k8s.io/apiextensions-apiserver"
85-
version = "kubernetes-1.16.0-beta.1"
85+
version = "kubernetes-1.16.0"
8686

8787
[[constraint]]
8888
name = "k8s.io/kubernetes"
89-
version = "v1.16.0-beta.1"
89+
version = "v1.16.0"
9090

9191
[[constraint]]
9292
name = "sigs.k8s.io/sig-storage-lib-external-provisioner"
@@ -135,9 +135,6 @@ name = "gopkg.in/fsnotify.v1"
135135
source = "https://github.com/fsnotify/fsnotify.git"
136136
version="v1.4.7"
137137

138-
[[override]]
139-
name = "k8s.io/kube-openapi"
140-
revision = "33be087ad058f99c78e067996202b60230737e49"
141138

142139
[[override]]
143140
name = "k8s.io/utils"
@@ -147,6 +144,14 @@ revision = "581e00157fb1a0435d4fac54a52d1ca1e481d60e"
147144
name = "github.com/prometheus/client_golang"
148145
version = "v0.9.2"
149146

147+
[[override]]
148+
name = "github.com/coreos/etcd"
149+
version = "v3.3.15"
150+
151+
[[override]]
152+
name = "k8s.io/kube-openapi"
153+
revision = "0270cf2f1c1d995d34b36019a6f65d58e6e33ad4"
154+
150155
[prune]
151156
go-tests = true
152157
unused-packages = true

pkg/csi/cinder/mount/mount.go

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
"k8s.io/apimachinery/pkg/util/wait"
2828
"k8s.io/klog"
2929
"k8s.io/kubernetes/pkg/util/mount"
30+
"k8s.io/kubernetes/pkg/volume/util/hostutil"
3031
utilexec "k8s.io/utils/exec"
3132
)
3233

@@ -40,7 +41,7 @@ const (
4041
)
4142

4243
type IMount interface {
43-
GetHostUtil() mount.HostUtils
44+
GetHostUtil() hostutil.HostUtils
4445
GetBaseMounter() *mount.SafeFormatAndMount
4546
ScanForAttach(devicePath string) error
4647
GetDevicePath(volumeID string) (string, error)
@@ -50,6 +51,8 @@ type IMount interface {
5051
Mount(source string, target string, fstype string, options []string) error
5152
UnmountPath(mountPath string) error
5253
GetInstanceID() (string, error)
54+
MakeFile(pathname string) error
55+
MakeDir(pathname string) error
5356
}
5457

5558
type Mount struct {
@@ -76,8 +79,8 @@ func (m *Mount) GetBaseMounter() *mount.SafeFormatAndMount {
7679

7780
}
7881

79-
func (m *Mount) GetHostUtil() mount.HostUtils {
80-
hostutil := mount.NewHostUtil()
82+
func (m *Mount) GetHostUtil() hostutil.HostUtils {
83+
hostutil := hostutil.NewHostUtil()
8184
return hostutil
8285
}
8386

@@ -244,6 +247,29 @@ func (m *Mount) GetInstanceID() (string, error) {
244247
return "", err
245248
}
246249

250+
// MakeDir creates dir
251+
func (m *Mount) MakeDir(pathname string) error {
252+
err := os.MkdirAll(pathname, os.FileMode(0755))
253+
if err != nil {
254+
if !os.IsExist(err) {
255+
return err
256+
}
257+
}
258+
return nil
259+
}
260+
261+
// MakeFile creates an empty file
262+
func (m *Mount) MakeFile(pathname string) error {
263+
f, err := os.OpenFile(pathname, os.O_CREATE, os.FileMode(0644))
264+
defer f.Close()
265+
if err != nil {
266+
if !os.IsExist(err) {
267+
return err
268+
}
269+
}
270+
return nil
271+
}
272+
247273
func IsCorruptedMnt(err error) bool {
248274
return mount.IsCorruptedMnt(err)
249275
}

0 commit comments

Comments
 (0)