diff --git a/pkg/operator/ceph/csi/betav1csidriver.go b/pkg/operator/ceph/csi/betav1csidriver.go index 255fcf6ee..ec3996e0c 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) } @@ -88,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 fdd9f9c80..ec373e872 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) } @@ -88,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 } diff --git a/pkg/operator/ceph/csi/spec.go b/pkg/operator/ceph/csi/spec.go index e74fef5a5..b798c8807 100644 --- a/pkg/operator/ceph/csi/spec.go +++ b/pkg/operator/ceph/csi/spec.go @@ -418,7 +418,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) @@ -436,7 +435,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 @@ -499,6 +497,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 { @@ -567,6 +566,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)