Skip to content

Commit 3ee52e3

Browse files
author
Ariel Kass
committed
fix compilation errors introduced by linter issue fixes
Signed-off-by: Ariel Kass <[email protected]>
1 parent ec3ba69 commit 3ee52e3

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

controllers/volumereplication_controller.go

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -197,12 +197,7 @@ func (r *VolumeReplicationReconciler) Reconcile(ctx context.Context, req ctrl.Re
197197
}
198198

199199
logger.Info("volume handle", "VolumeHandleName", volumeHandle)
200-
replicationSource, err := r.getReplicationSource(instance.Spec.DataSource.Kind, volumeHandle)
201-
if err != nil {
202-
logger.Error(err, "failed to update volumeReplication source", "VRName", instance.Name)
203-
204-
return ctrl.Result{}, nil
205-
}
200+
replicationSource := r.getReplicationSource(instance.Spec.DataSource.Kind, volumeHandle)
206201
logger.Info("Replication source", "replicationSource", replicationSource)
207202

208203
if replicationHandle != "" {
@@ -416,19 +411,19 @@ func (r *VolumeReplicationReconciler) SetupWithManager(mgr ctrl.Manager, cfg *co
416411
pred := predicate.GenerationChangedPredicate{}
417412

418413
r.DriverConfig = cfg
419-
grpcClient, err := grpcClient.New(cfg.DriverEndpoint, cfg.RPCTimeout)
414+
gClient, err := grpcClient.New(cfg.DriverEndpoint, cfg.RPCTimeout)
420415
if err != nil {
421416
r.Log.Error(err, "failed to create GRPC Client", "Endpoint", cfg.DriverEndpoint, "GRPC Timeout", cfg.RPCTimeout)
422417

423418
return err
424419
}
425-
err = grpcClient.Probe()
420+
err = gClient.Probe()
426421
if err != nil {
427422
r.Log.Error(err, "failed to connect to driver", "Endpoint", cfg.DriverEndpoint, "GRPC Timeout", cfg.RPCTimeout)
428423

429424
return err
430425
}
431-
r.GRPCClient = grpcClient
426+
r.GRPCClient = gClient
432427
r.Replication = grpcClient.NewReplicationClient(r.GRPCClient.Client, cfg.RPCTimeout)
433428

434429
return ctrl.NewControllerManagedBy(mgr).

0 commit comments

Comments
 (0)