From d246dde443bc2e68ce63f4a8575968ab16ff7c9d Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Tue, 24 Aug 2021 19:43:18 +0530 Subject: [PATCH] ceph: remove variable declaration remove csiDriver and csiClient variables creation and reuse them from the method receivers. Signed-off-by: Madhu Rajanna --- pkg/operator/ceph/csi/betav1csidriver.go | 14 ++++++-------- pkg/operator/ceph/csi/csidriver.go | 14 ++++++-------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/pkg/operator/ceph/csi/betav1csidriver.go b/pkg/operator/ceph/csi/betav1csidriver.go index 812968c3a..4d98941ab 100644 --- a/pkg/operator/ceph/csi/betav1csidriver.go +++ b/pkg/operator/ceph/csi/betav1csidriver.go @@ -90,18 +90,16 @@ func (d beta1CsiDriver) createCSIDriverInfo(ctx context.Context, clientset kuber } func (d beta1CsiDriver) reCreateCSIDriverInfo(ctx context.Context) error { - csiDriver := d.csiDriver - csiClient := d.csiClient - err := csiClient.Delete(ctx, csiDriver.Name, metav1.DeleteOptions{}) + err := d.csiClient.Delete(ctx, d.csiDriver.Name, metav1.DeleteOptions{}) if err != nil { - return errors.Wrapf(err, "failed to delete CSIDriver object for driver %q", csiDriver.Name) + return errors.Wrapf(err, "failed to delete CSIDriver object for driver %q", d.csiDriver.Name) } - logger.Infof("CSIDriver object deleted for driver %q", csiDriver.Name) - _, err = csiClient.Create(ctx, csiDriver, metav1.CreateOptions{}) + logger.Infof("CSIDriver object deleted for driver %q", d.csiDriver.Name) + _, err = d.csiClient.Create(ctx, d.csiDriver, metav1.CreateOptions{}) if err != nil { - return errors.Wrapf(err, "failed to recreate CSIDriver object for driver %q", csiDriver.Name) + return errors.Wrapf(err, "failed to recreate CSIDriver object for driver %q", d.csiDriver.Name) } - logger.Infof("CSIDriver object recreated for driver %q", csiDriver.Name) + logger.Infof("CSIDriver object recreated for driver %q", d.csiDriver.Name) return nil } diff --git a/pkg/operator/ceph/csi/csidriver.go b/pkg/operator/ceph/csi/csidriver.go index 0c31e6e68..610fa5d60 100644 --- a/pkg/operator/ceph/csi/csidriver.go +++ b/pkg/operator/ceph/csi/csidriver.go @@ -90,18 +90,16 @@ func (d v1CsiDriver) createCSIDriverInfo(ctx context.Context, clientset kubernet } func (d v1CsiDriver) reCreateCSIDriverInfo(ctx context.Context) error { - csiDriver := d.csiDriver - csiClient := d.csiClient - err := csiClient.Delete(ctx, csiDriver.Name, metav1.DeleteOptions{}) + err := d.csiClient.Delete(ctx, d.csiDriver.Name, metav1.DeleteOptions{}) if err != nil { - return errors.Wrapf(err, "failed to delete CSIDriver object for driver %q", csiDriver.Name) + return errors.Wrapf(err, "failed to delete CSIDriver object for driver %q", d.csiDriver.Name) } - logger.Infof("CSIDriver object deleted for driver %q", csiDriver.Name) - _, err = csiClient.Create(ctx, d.csiDriver, metav1.CreateOptions{}) + logger.Infof("CSIDriver object deleted for driver %q", d.csiDriver.Name) + _, err = d.csiClient.Create(ctx, d.csiDriver, metav1.CreateOptions{}) if err != nil { - return errors.Wrapf(err, "failed to recreate CSIDriver object for driver %q", csiDriver.Name) + return errors.Wrapf(err, "failed to recreate CSIDriver object for driver %q", d.csiDriver.Name) } - logger.Infof("CSIDriver object recreated for driver %q", csiDriver.Name) + logger.Infof("CSIDriver object recreated for driver %q", d.csiDriver.Name) return nil }