@@ -669,15 +669,16 @@ func (r *ReconcileCnsRegisterVolume) Reconcile(ctx context.Context,
669
669
pvcSpec , metav1.CreateOptions {})
670
670
if err != nil {
671
671
log .Errorf ("Failed to create PVC with spec: %+v. Error: %+v" , pvcSpec , err )
672
- setInstanceError ( ctx , r , instance ,
673
- fmt . Sprintf ( "Failed to create PVC: %s for volume with err: %+v" , instance . Spec . PvcName , err ) )
672
+ errMsg := fmt . Sprintf ( "Failed to create PVC: %s for volume with err: %+v" , instance . Spec . PvcName , err )
673
+ setInstanceError ( ctx , r , instance , errMsg )
674
674
// Delete PV created above.
675
675
err = k8sclient .CoreV1 ().PersistentVolumes ().Delete (ctx , pvName , * metav1 .NewDeleteOptions (0 ))
676
676
if err != nil {
677
677
log .Errorf ("Delete PV %s failed with error: %+v" , pvName , err )
678
+ combinedErrMsg := fmt .Sprintf ("%s. Additionally, cleanup failed: Delete PV %s failed with error: %+v" ,
679
+ errMsg , pvName , err )
680
+ setInstanceError (ctx , r , instance , combinedErrMsg )
678
681
}
679
- setInstanceError (ctx , r , instance ,
680
- fmt .Sprintf ("Delete PV %s failed with error: %+v" , pvName , err ))
681
682
return reconcile.Result {RequeueAfter : timeout }, nil
682
683
} else {
683
684
log .Infof ("PVC: %s is created successfully" , instance .Spec .PvcName )
0 commit comments