fix pv name update many times bug

Signed-off-by: stoneshi-yunify <[email protected]>
kubesphere · Nov 22, 2024 · b126223 · b126223
1 parent ec4523e
commit b126223
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/internal/controller/nfs.go b/internal/controller/nfs.go
@@ -95,9 +95,12 @@ func (p NFSPVC) ParsePV() (*corev1.PersistentVolume, error) {
 		}
 	}
 
-	name, ok := p.Annotations[AnnotationPVName]
-	if !ok || name == "" {
-		name = fmt.Sprintf("pvc-%s", uuid.NewUUID())
+	name := p.Spec.VolumeName
+	if name == "" {
+		name, ok = p.Annotations[AnnotationPVName]
+		if !ok || name == "" {
+			name = fmt.Sprintf("pvc-%s", uuid.NewUUID())
+		}
 	}
 
 	var storageClassName string

diff --git a/internal/controller/persistentvolumeclaim_controller.go b/internal/controller/persistentvolumeclaim_controller.go
@@ -67,6 +67,11 @@ func (r *PersistentVolumeClaimReconciler) Reconcile(ctx context.Context, req ctr
 		return ctrl.Result{}, nil
 	}
 
+	if pvc.Status.Phase == corev1.ClaimBound {
+		logger.V(4).Info("pvc already bound")
+		return ctrl.Result{}, nil
+	}
+
 	if pvc.Spec.StorageClassName == nil || *pvc.Spec.StorageClassName != "" {
 		logger.V(4).Info("pvc's StorageClassName is not empty string which means pv is not static provision")
 		return ctrl.Result{}, nil
@@ -116,6 +121,10 @@ func (r *PersistentVolumeClaimReconciler) Reconcile(ctx context.Context, req ctr
 				} else {
 					r.Recorder.Eventf(pvc, corev1.EventTypeWarning, "CreatePVFailed", "failed to create pv %s, error: %s", pv.Name, err.Error())
 				}
+				if err == nil {
+					pvc.Spec.VolumeName = pv.Name
+					err = r.Client.Update(ctx, pvc)
+				}
 				return ctrl.Result{}, err
 			} else {
 				return ctrl.Result{}, err