mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-11-09 16:00:22 +00:00
Merge pull request #186 from Madhu-1/remove-glog
Remove glog from Gopkg.toml
This commit is contained in:
commit
a195856104
3
Gopkg.lock
generated
3
Gopkg.lock
generated
@ -531,7 +531,7 @@
|
||||
analyzer-version = 1
|
||||
input-imports = [
|
||||
"github.com/container-storage-interface/spec/lib/go/csi",
|
||||
"github.com/golang/glog",
|
||||
"github.com/golang/protobuf/ptypes",
|
||||
"github.com/golang/protobuf/ptypes/timestamp",
|
||||
"github.com/kubernetes-csi/drivers/pkg/csi-common",
|
||||
"github.com/pborman/uuid",
|
||||
@ -547,6 +547,7 @@
|
||||
"k8s.io/client-go/kubernetes",
|
||||
"k8s.io/client-go/rest",
|
||||
"k8s.io/client-go/tools/clientcmd",
|
||||
"k8s.io/klog",
|
||||
"k8s.io/kubernetes/pkg/util/keymutex",
|
||||
"k8s.io/kubernetes/pkg/util/mount",
|
||||
"k8s.io/kubernetes/pkg/util/nsenter",
|
||||
|
@ -6,10 +6,6 @@
|
||||
branch = "master"
|
||||
name = "github.com/kubernetes-csi/drivers"
|
||||
|
||||
[[constraint]]
|
||||
branch = "master"
|
||||
name = "github.com/golang/glog"
|
||||
|
||||
[[override]]
|
||||
revision = "5db89f0ca68677abc5eefce8f2a0a772c98ba52d"
|
||||
name = "github.com/docker/distribution"
|
||||
|
@ -22,7 +22,7 @@ import (
|
||||
"path"
|
||||
"text/template"
|
||||
|
||||
"github.com/golang/glog"
|
||||
"k8s.io/klog"
|
||||
)
|
||||
|
||||
const cephConfig = `[global]
|
||||
@ -91,7 +91,7 @@ func writeCephTemplate(fileName string, m os.FileMode, t *template.Template, dat
|
||||
|
||||
defer func() {
|
||||
if err := f.Close(); err != nil {
|
||||
glog.Errorf("failed to close file %s with error %s", f.Name(), err)
|
||||
klog.Errorf("failed to close file %s with error %s", f.Name(), err)
|
||||
}
|
||||
}()
|
||||
|
||||
|
@ -22,7 +22,7 @@ import (
|
||||
"fmt"
|
||||
"os"
|
||||
|
||||
"github.com/golang/glog"
|
||||
"k8s.io/klog"
|
||||
)
|
||||
|
||||
const (
|
||||
@ -120,12 +120,12 @@ func deleteCephUser(adminCr *credentials, volID volumeID) error {
|
||||
|
||||
keyringPath := getCephKeyringPath(volID, userID)
|
||||
if err = os.Remove(keyringPath); err != nil {
|
||||
glog.Errorf("failed to remove keyring file %s with error %s", keyringPath, err)
|
||||
klog.Errorf("failed to remove keyring file %s with error %s", keyringPath, err)
|
||||
}
|
||||
|
||||
secretPath := getCephSecretPath(volID, userID)
|
||||
if err = os.Remove(secretPath); err != nil {
|
||||
glog.Errorf("failed to remove secret file %s with error %s", secretPath, err)
|
||||
klog.Errorf("failed to remove secret file %s with error %s", secretPath, err)
|
||||
}
|
||||
|
||||
return nil
|
||||
|
@ -21,7 +21,7 @@ import (
|
||||
"os"
|
||||
"path"
|
||||
|
||||
"github.com/golang/glog"
|
||||
"k8s.io/klog"
|
||||
)
|
||||
|
||||
const (
|
||||
@ -141,10 +141,10 @@ func purgeVolume(volID volumeID, adminCr *credentials, volOptions *volumeOptions
|
||||
func umountAndRemove(mountPoint string) {
|
||||
var err error
|
||||
if err = unmountVolume(mountPoint); err != nil {
|
||||
glog.Errorf("failed to unmount %s with error %s", mountPoint, err)
|
||||
klog.Errorf("failed to unmount %s with error %s", mountPoint, err)
|
||||
}
|
||||
|
||||
if err = os.Remove(mountPoint); err != nil {
|
||||
glog.Errorf("failed to remove %s with error %s", mountPoint, err)
|
||||
klog.Errorf("failed to remove %s with error %s", mountPoint, err)
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user