mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-26 16:20:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #186 from Madhu-1/remove-glog

Browse Source 
Remove glog from Gopkg.toml
This commit is contained in:
Huamin Chen 2019-02-08 07:23:13 -05:00 committed by GitHub
commit a195856104
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Gopkg.lock generated
View File

@ -531,7 +531,7 @@
analyzer-version = 1 analyzer-version = 1
input-imports = [ input-imports = [
"github.com/container-storage-interface/spec/lib/go/csi", "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/golang/protobuf/ptypes/timestamp",
"github.com/kubernetes-csi/drivers/pkg/csi-common", "github.com/kubernetes-csi/drivers/pkg/csi-common",
"github.com/pborman/uuid", "github.com/pborman/uuid",
@ -547,6 +547,7 @@
"k8s.io/client-go/kubernetes", "k8s.io/client-go/kubernetes",
"k8s.io/client-go/rest", "k8s.io/client-go/rest",
"k8s.io/client-go/tools/clientcmd", "k8s.io/client-go/tools/clientcmd",
"k8s.io/klog",
"k8s.io/kubernetes/pkg/util/keymutex", "k8s.io/kubernetes/pkg/util/keymutex",
"k8s.io/kubernetes/pkg/util/mount", "k8s.io/kubernetes/pkg/util/mount",
"k8s.io/kubernetes/pkg/util/nsenter", "k8s.io/kubernetes/pkg/util/nsenter",

4
Gopkg.toml
View File

@ -6,10 +6,6 @@
branch = "master" branch = "master"
name = "github.com/kubernetes-csi/drivers" name = "github.com/kubernetes-csi/drivers"
[[constraint]]
branch = "master"
name = "github.com/golang/glog"
[[override]] [[override]]
revision = "5db89f0ca68677abc5eefce8f2a0a772c98ba52d" revision = "5db89f0ca68677abc5eefce8f2a0a772c98ba52d"
name = "github.com/docker/distribution" name = "github.com/docker/distribution"

4
pkg/cephfs/cephconf.go
View File

@ -22,7 +22,7 @@ import (
"path" "path"
"text/template" "text/template"
"github.com/golang/glog" "k8s.io/klog"
) )
const cephConfig = `[global] const cephConfig = `[global]
@ -91,7 +91,7 @@ func writeCephTemplate(fileName string, m os.FileMode, t *template.Template, dat
defer func() { defer func() {
if err := f.Close(); err != nil { 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)
} }
}() }()

6
pkg/cephfs/cephuser.go
View File

@ -22,7 +22,7 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/golang/glog" "k8s.io/klog"
) )
const ( const (
@ -120,12 +120,12 @@ func deleteCephUser(adminCr *credentials, volID volumeID) error {
keyringPath := getCephKeyringPath(volID, userID) keyringPath := getCephKeyringPath(volID, userID)
if err = os.Remove(keyringPath); err != nil { 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) secretPath := getCephSecretPath(volID, userID)
if err = os.Remove(secretPath); err != nil { 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 return nil

6
pkg/cephfs/volume.go
View File

@ -21,7 +21,7 @@ import (
"os" "os"
"path" "path"
"github.com/golang/glog" "k8s.io/klog"
) )
const ( const (
@ -141,10 +141,10 @@ func purgeVolume(volID volumeID, adminCr *credentials, volOptions *volumeOptions
func umountAndRemove(mountPoint string) { func umountAndRemove(mountPoint string) {
var err error var err error
if err = unmountVolume(mountPoint); err != nil { 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 { 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)
} }
} }