> fix nfs dataset pvc/pv bound incorrect (#2)

kebe7jun · web-flow · commit 7707bfaa4f6c · 2025-04-10T16:30:37.000+08:00
diff --git a/internal/controller/dataset/dataset_controller.go b/internal/controller/dataset/dataset_controller.go
@@ -184,6 +184,7 @@ func (r *DatasetReconciler) reconcilePVC(ctx context.Context, ds *datasetv1alpha
 
 	forceStorageClass := ""
 	var spec *corev1.PersistentVolumeClaimSpec
+	volumeNameOverride := ""
 
 	switch ds.Spec.Source.Type {
 	case datasetv1alpha1.DatasetTypeReference:
@@ -379,6 +380,7 @@ spec:
 		}
 		// 标记 ds.Status.LastSucceedRound = ds.Spec.DataSyncRound
 		ds.Status.LastSucceedRound = ds.Spec.DataSyncRound
+		volumeNameOverride = pvTemp.Name
 	default:
 		// 其他类型先不做特殊逻辑
 	}
@@ -434,6 +436,9 @@ spec:
 			spec.StorageClassName = lo.ToPtr(forceStorageClass)
 		}
 	}
+	if volumeNameOverride != "" {
+		spec.VolumeName = volumeNameOverride
+	}
 
 	if k8serrors.IsNotFound(err) {
 		// 不存在就创建

Original file line number	Diff line number	Diff line change
`@@ -184,6 +184,7 @@ func (r DatasetReconciler) reconcilePVC(ctx context.Context, ds datasetv1alpha`
`184`	`184`
`185`	`185`	`forceStorageClass := ""`
`186`	`186`	`var spec *corev1.PersistentVolumeClaimSpec`
	`187`	`+ volumeNameOverride := ""`
`187`	`188`
`188`	`189`	`switch ds.Spec.Source.Type {`
`189`	`190`	`case datasetv1alpha1.DatasetTypeReference:`
`@@ -379,6 +380,7 @@ spec:`
`379`	`380`	`}`
`380`	`381`	`// 标记 ds.Status.LastSucceedRound = ds.Spec.DataSyncRound`
`381`	`382`	`ds.Status.LastSucceedRound = ds.Spec.DataSyncRound`
	`383`	`+ volumeNameOverride = pvTemp.Name`
`382`	`384`	`default:`
`383`	`385`	`// 其他类型先不做特殊逻辑`
`384`	`386`	`}`
`@@ -434,6 +436,9 @@ spec:`
`434`	`436`	`spec.StorageClassName = lo.ToPtr(forceStorageClass)`
`435`	`437`	`}`
`436`	`438`	`}`
	`439`	`+ if volumeNameOverride != "" {`
	`440`	`+ spec.VolumeName = volumeNameOverride`
	`441`	`+ }`
`437`	`442`
`438`	`443`	`if k8serrors.IsNotFound(err) {`
`439`	`444`	`// 不存在就创建`