@@ -19,15 +19,16 @@ import (
1919 "strings"
2020 "time"
2121
22+ "context"
23+
24+ "github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta"
2225 csi "github.com/container-storage-interface/spec/lib/go/csi"
23- "github.com/golang/glog"
24- "golang.org/x/net/context"
2526 computebeta "google.golang.org/api/compute/v0.beta"
2627 compute "google.golang.org/api/compute/v1"
2728 "google.golang.org/grpc/codes"
2829 "google.golang.org/grpc/status"
2930 "k8s.io/apimachinery/pkg/util/wait"
30- "k8s.io/kubernetes/pkg/cloudprovider/providers/gce/cloud/meta "
31+ "k8s.io/klog "
3132 "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/common"
3233)
3334
@@ -143,23 +144,23 @@ func (cloud *CloudProvider) GetDisk(ctx context.Context, key *meta.Key) (*CloudD
143144func (cloud * CloudProvider ) getZonalDiskOrError (ctx context.Context , volumeZone , volumeName string ) (* compute.Disk , error ) {
144145 svc := cloud .service
145146 project := cloud .project
146- glog .V (4 ).Infof ("Getting disk %v from zone %v" , volumeName , volumeZone )
147+ klog .V (4 ).Infof ("Getting disk %v from zone %v" , volumeName , volumeZone )
147148 disk , err := svc .Disks .Get (project , volumeZone , volumeName ).Context (ctx ).Do ()
148149 if err != nil {
149150 return nil , err
150151 }
151- glog .V (4 ).Infof ("Got disk %v from zone %v" , volumeName , volumeZone )
152+ klog .V (4 ).Infof ("Got disk %v from zone %v" , volumeName , volumeZone )
152153 return disk , nil
153154}
154155
155156func (cloud * CloudProvider ) getRegionalDiskOrError (ctx context.Context , volumeRegion , volumeName string ) (* computebeta.Disk , error ) {
156157 project := cloud .project
157- glog .V (4 ).Infof ("Getting disk %v from region %v" , volumeName , volumeRegion )
158+ klog .V (4 ).Infof ("Getting disk %v from region %v" , volumeName , volumeRegion )
158159 disk , err := cloud .betaService .RegionDisks .Get (project , volumeRegion , volumeName ).Context (ctx ).Do ()
159160 if err != nil {
160161 return nil , err
161162 }
162- glog .V (4 ).Infof ("Got disk %v from region %v" , volumeName , volumeRegion )
163+ klog .V (4 ).Infof ("Got disk %v from region %v" , volumeName , volumeRegion )
163164 return disk , nil
164165}
165166
@@ -198,7 +199,7 @@ func (cloud *CloudProvider) ValidateExistingDisk(ctx context.Context, resp *Clou
198199 }
199200
200201 // Volume exists with matching name, capacity, type.
201- glog .V (4 ).Infof ("Compatible disk already exists. Reusing existing." )
202+ klog .V (4 ).Infof ("Compatible disk already exists. Reusing existing." )
202203 return nil
203204}
204205
@@ -245,7 +246,7 @@ func (cloud *CloudProvider) insertRegionalDisk(ctx context.Context, volKey *meta
245246 if err != nil {
246247 return err
247248 }
248- glog .Warningf ("GCE PD %s already exists, reusing" , volKey .Name )
249+ klog .Warningf ("GCE PD %s already exists, reusing" , volKey .Name )
249250 return nil
250251 }
251252 return status .Error (codes .Internal , fmt .Sprintf ("unkown Insert disk error: %v" , err ))
@@ -264,7 +265,7 @@ func (cloud *CloudProvider) insertRegionalDisk(ctx context.Context, volKey *meta
264265 if err != nil {
265266 return err
266267 }
267- glog .Warningf ("GCE PD %s already exists after wait, reusing" , volKey .Name )
268+ klog .Warningf ("GCE PD %s already exists after wait, reusing" , volKey .Name )
268269 return nil
269270 }
270271 return fmt .Errorf ("unkown Insert disk operation error: %v" , err )
@@ -304,7 +305,7 @@ func (cloud *CloudProvider) insertZonalDisk(ctx context.Context, volKey *meta.Ke
304305 if err != nil {
305306 return err
306307 }
307- glog .Warningf ("GCE PD %s already exists, reusing" , volKey .Name )
308+ klog .Warningf ("GCE PD %s already exists, reusing" , volKey .Name )
308309 return nil
309310 }
310311 return fmt .Errorf ("unkown Insert disk error: %v" , err )
@@ -324,7 +325,7 @@ func (cloud *CloudProvider) insertZonalDisk(ctx context.Context, volKey *meta.Ke
324325 if err != nil {
325326 return err
326327 }
327- glog .Warningf ("GCE PD %s already exists after wait, reusing" , volKey .Name )
328+ klog .Warningf ("GCE PD %s already exists after wait, reusing" , volKey .Name )
328329 return nil
329330 }
330331 return fmt .Errorf ("unkown Insert disk operation error: %v" , err )
@@ -465,7 +466,7 @@ func (cloud *CloudProvider) waitForZonalOp(ctx context.Context, op *compute.Oper
465466 return wait .Poll (3 * time .Second , 5 * time .Minute , func () (bool , error ) {
466467 pollOp , err := svc .ZoneOperations .Get (project , zone , op .Name ).Context (ctx ).Do ()
467468 if err != nil {
468- glog .Errorf ("WaitForOp(op: %#v, zone: %#v) failed to poll the operation" , op , zone )
469+ klog .Errorf ("WaitForOp(op: %#v, zone: %#v) failed to poll the operation" , op , zone )
469470 return false , err
470471 }
471472 done , err := opIsDone (pollOp )
@@ -477,7 +478,7 @@ func (cloud *CloudProvider) waitForRegionalOp(ctx context.Context, op *computebe
477478 return wait .Poll (3 * time .Second , 5 * time .Minute , func () (bool , error ) {
478479 pollOp , err := cloud .betaService .RegionOperations .Get (cloud .project , region , op .Name ).Context (ctx ).Do ()
479480 if err != nil {
480- glog .Errorf ("WaitForOp(op: %#v, region: %#v) failed to poll the operation" , op , region )
481+ klog .Errorf ("WaitForOp(op: %#v, region: %#v) failed to poll the operation" , op , region )
481482 return false , err
482483 }
483484 done , err := regionalOpIsDone (pollOp )
@@ -491,7 +492,7 @@ func (cloud *CloudProvider) waitForGlobalOp(ctx context.Context, op *compute.Ope
491492 return wait .Poll (3 * time .Second , 5 * time .Minute , func () (bool , error ) {
492493 pollOp , err := svc .GlobalOperations .Get (project , op .Name ).Context (ctx ).Do ()
493494 if err != nil {
494- glog .Errorf ("waitForGlobalOp(op: %#v) failed to poll the operation" , op )
495+ klog .Errorf ("waitForGlobalOp(op: %#v) failed to poll the operation" , op )
495496 return false , err
496497 }
497498 done , err := opIsDone (pollOp )
@@ -503,7 +504,7 @@ func (cloud *CloudProvider) WaitForAttach(ctx context.Context, volKey *meta.Key,
503504 return wait .Poll (5 * time .Second , 2 * time .Minute , func () (bool , error ) {
504505 disk , err := cloud .GetDisk (ctx , volKey )
505506 if err != nil {
506- glog .Errorf ("GetDisk failed to get disk: %v" , err )
507+ klog .Errorf ("GetDisk failed to get disk: %v" , err )
507508 return false , err
508509 }
509510
@@ -543,25 +544,25 @@ func regionalOpIsDone(op *computebeta.Operation) (bool, error) {
543544func (cloud * CloudProvider ) GetInstanceOrError (ctx context.Context , instanceZone , instanceName string ) (* compute.Instance , error ) {
544545 svc := cloud .service
545546 project := cloud .project
546- glog .V (4 ).Infof ("Getting instance %v from zone %v" , instanceName , instanceZone )
547+ klog .V (4 ).Infof ("Getting instance %v from zone %v" , instanceName , instanceZone )
547548
548549 instance , err := svc .Instances .Get (project , instanceZone , instanceName ).Do ()
549550 if err != nil {
550551 return nil , err
551552 }
552- glog .V (4 ).Infof ("Got instance %v from zone %v" , instanceName , instanceZone )
553+ klog .V (4 ).Infof ("Got instance %v from zone %v" , instanceName , instanceZone )
553554 return instance , nil
554555}
555556
556557func (cloud * CloudProvider ) GetSnapshot (ctx context.Context , snapshotName string ) (* compute.Snapshot , error ) {
557558 svc := cloud .service
558559 project := cloud .project
559- glog .V (4 ).Infof ("Getting snapshot %v" , snapshotName )
560+ klog .V (4 ).Infof ("Getting snapshot %v" , snapshotName )
560561 snapshot , err := svc .Snapshots .Get (project , snapshotName ).Context (ctx ).Do ()
561562 if err != nil {
562563 return nil , err
563564 }
564- glog .V (4 ).Infof ("Got snapshot %v" , snapshotName )
565+ klog .V (4 ).Infof ("Got snapshot %v" , snapshotName )
565566 return snapshot , nil
566567}
567568
@@ -629,16 +630,16 @@ func (cloud *CloudProvider) waitForSnapshotCreation(ctx context.Context, snapsho
629630 for {
630631 select {
631632 case <- ticker .C :
632- glog .V (5 ).Infof ("Checking GCE Snapshot %s." , snapshotName )
633+ klog .V (5 ).Infof ("Checking GCE Snapshot %s." , snapshotName )
633634 snapshot , err := cloud .GetSnapshot (ctx , snapshotName )
634635 if err != nil {
635- glog .Warningf ("Error in getting snapshot %s, %v" , snapshotName , err )
636+ klog .Warningf ("Error in getting snapshot %s, %v" , snapshotName , err )
636637 } else if snapshot != nil {
637638 if snapshot .Status != "CREATING" {
638- glog .V (5 ).Infof ("Snapshot %s status is %s" , snapshotName , snapshot .Status )
639+ klog .V (5 ).Infof ("Snapshot %s status is %s" , snapshotName , snapshot .Status )
639640 return snapshot , nil
640641 } else {
641- glog .V (5 ).Infof ("Snapshot %s is still creating ..." , snapshotName )
642+ klog .V (5 ).Infof ("Snapshot %s is still creating ..." , snapshotName )
642643 }
643644 }
644645 case <- timer .C :
0 commit comments