From d48f67a82cb580791b42102f693962a404009094 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Tue, 24 Aug 2021 12:15:48 +0530 Subject: [PATCH 1/3] ceph: fix panic in reCreateCSIDriverInfo Initialize the client and the csidriver object before calling the reCreateCSIDriverInfo function. Signed-off-by: Madhu Rajanna --- pkg/operator/ceph/csi/betav1csidriver.go | 2 ++ pkg/operator/ceph/csi/csidriver.go | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkg/operator/ceph/csi/betav1csidriver.go b/pkg/operator/ceph/csi/betav1csidriver.go index 3d33ecd14..812968c3a 100644 --- a/pkg/operator/ceph/csi/betav1csidriver.go +++ b/pkg/operator/ceph/csi/betav1csidriver.go @@ -72,6 +72,8 @@ func (d beta1CsiDriver) createCSIDriverInfo(ctx context.Context, clientset kuber // As FSGroupPolicy field is immutable, should be set only during create time. // if the request is to change the FSGroupPolicy, we are deleting the CSIDriver object and creating it. if driver.Spec.FSGroupPolicy != nil && csiDriver.Spec.FSGroupPolicy != nil && *driver.Spec.FSGroupPolicy != *csiDriver.Spec.FSGroupPolicy { + d.csiClient = csidrivers + d.csiDriver = csiDriver return d.reCreateCSIDriverInfo(ctx) } diff --git a/pkg/operator/ceph/csi/csidriver.go b/pkg/operator/ceph/csi/csidriver.go index f30267462..0c31e6e68 100644 --- a/pkg/operator/ceph/csi/csidriver.go +++ b/pkg/operator/ceph/csi/csidriver.go @@ -72,6 +72,8 @@ func (d v1CsiDriver) createCSIDriverInfo(ctx context.Context, clientset kubernet // As FSGroupPolicy field is immutable, should be set only during create time. // if the request is to change the FSGroupPolicy, we are deleting the CSIDriver object and creating it. if driver.Spec.FSGroupPolicy != nil && csiDriver.Spec.FSGroupPolicy != nil && *driver.Spec.FSGroupPolicy != *csiDriver.Spec.FSGroupPolicy { + d.csiClient = csidrivers + d.csiDriver = csiDriver return d.reCreateCSIDriverInfo(ctx) } From e2dc41837151c4b9372701c65459fd3e09af2ba2 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Tue, 24 Aug 2021 12:19:57 +0530 Subject: [PATCH 2/3] ceph: fix logging of csidriver log the successful message about starting CSIDriver after creating the daemonset and deployment objects. Signed-off-by: Madhu Rajanna --- pkg/operator/ceph/csi/spec.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/operator/ceph/csi/spec.go b/pkg/operator/ceph/csi/spec.go index bc3a7bc51..3f1bab1e8 100644 --- a/pkg/operator/ceph/csi/spec.go +++ b/pkg/operator/ceph/csi/spec.go @@ -435,7 +435,6 @@ func startDrivers(clientset kubernetes.Interface, rookclientset rookclient.Inter return errors.Wrap(err, "failed to load rbd plugin service template") } rbdService.Namespace = namespace - logger.Info("successfully started CSI Ceph RBD") } if EnableCephFS { cephfsPlugin, err = templateToDaemonSet("cephfsplugin", CephFSPluginTemplatePath, tp) @@ -453,7 +452,6 @@ func startDrivers(clientset kubernetes.Interface, rookclientset rookclient.Inter return errors.Wrap(err, "failed to load cephfs plugin service template") } cephfsService.Namespace = namespace - logger.Info("successfully started CSI CephFS driver") } // get common provisioner tolerations and node affinity @@ -516,6 +514,7 @@ func startDrivers(clientset kubernetes.Interface, rookclientset rookclient.Inter return errors.Wrapf(err, "failed to start rbd provisioner deployment: %+v", rbdProvisionerDeployment) } k8sutil.AddRookVersionLabelToDeployment(rbdProvisionerDeployment) + logger.Info("successfully started CSI Ceph RBD driver") } if rbdService != nil { @@ -584,6 +583,7 @@ func startDrivers(clientset kubernetes.Interface, rookclientset rookclient.Inter return errors.Wrapf(err, "failed to start cephfs provisioner deployment: %+v", cephfsProvisionerDeployment) } k8sutil.AddRookVersionLabelToDeployment(cephfsProvisionerDeployment) + logger.Info("successfully started CSI CephFS driver") } if cephfsService != nil { err = ownerInfo.SetControllerReference(cephfsService) From d246dde443bc2e68ce63f4a8575968ab16ff7c9d Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Tue, 24 Aug 2021 19:43:18 +0530 Subject: [PATCH 3/3] 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 }