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

fixes broken migration to klog

Browse Source
This commit is contained in:
gman 2019-02-09 20:59:01 +01:00
parent a195856104
commit 1748629de2
2 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cmd/cephfs/main.go
View File

@ -26,13 +26,6 @@ import (
"k8s.io/klog"
)
func init() {
if err := flag.Set("logtostderr", "true"); err != nil {
klog.Errorf("failed to set logtostderr flag: %v", err)
os.Exit(1)
}
}
var (
endpoint = flag.String("endpoint", "unix://tmp/csi.sock", "CSI endpoint")
driverName = flag.String("drivername", "csi-cephfsplugin", "name of the driver")
@ -42,8 +35,27 @@ var (
)
func main() {
if err := flag.Set("logtostderr", "true"); err != nil {
klog.Errorf("failed to set logtostderr flag: %v", err)
os.Exit(1)
}
flag.Parse()
// TODO: remove this once github.com/kubernetes-csi/drivers/pkg/csi-common pkg moves to klog
klogFlags := flag.NewFlagSet("klog", flag.ExitOnError)
klog.InitFlags(klogFlags)
// Sync klog flags with glog
flag.CommandLine.VisitAll(func(f1 *flag.Flag) {
if f2 := klogFlags.Lookup(f1.Name); f2 != nil {
if err := f2.Value.Set(f1.Value.String()); err != nil {
klog.Errorf("failed to set %s flag: %v", f1.Name, err)
os.Exit(1)
}
}
})
if err := createPersistentStorage(path.Join(cephfs.PluginFolder, "controller")); err != nil {
klog.Errorf("failed to create persistent storage for controller: %v", err)
os.Exit(1)

26
cmd/rbd/main.go
View File

@ -26,13 +26,6 @@ import (
"k8s.io/klog"
)
func init() {
if err := flag.Set("logtostderr", "true"); err != nil {
klog.Errorf("failed to set logtostderr flag: %v", err)
os.Exit(1)
}
}
var (
endpoint = flag.String("endpoint", "unix://tmp/csi.sock", "CSI endpoint")
driverName = flag.String("drivername", "csi-rbdplugin", "name of the driver")
@ -42,8 +35,27 @@ var (
)
func main() {
if err := flag.Set("logtostderr", "true"); err != nil {
klog.Errorf("failed to set logtostderr flag: %v", err)
os.Exit(1)
}
flag.Parse()
// TODO: remove this once github.com/kubernetes-csi/drivers/pkg/csi-common pkg moves to klog
klogFlags := flag.NewFlagSet("klog", flag.ExitOnError)
klog.InitFlags(klogFlags)
// Sync klog flags with glog
flag.CommandLine.VisitAll(func(f1 *flag.Flag) {
if f2 := klogFlags.Lookup(f1.Name); f2 != nil {
if err := f2.Value.Set(f1.Value.String()); err != nil {
klog.Errorf("failed to set %s flag: %v", f1.Name, err)
os.Exit(1)
}
}
})
if err := createPersistentStorage(path.Join(rbd.PluginFolder, "controller")); err != nil {
klog.Errorf("failed to create persistent storage for controller %v", err)
os.Exit(1)