chore(parameters): treat nil and empty ConfigItemDetails as equal (#10420)

weicao · apecloud-bot · commit 05a401e07b61 · 2026-06-22T08:52:12.000Z
(cherry picked from commit db9c15c)
diff --git a/controllers/parameters/componentdrivenparameter_controller.go b/controllers/parameters/componentdrivenparameter_controller.go
@@ -142,6 +142,9 @@ func (r *ComponentDrivenParameterReconciler) delete(reqCtx intctrlutil.RequestCt
 
 func (r *ComponentDrivenParameterReconciler) update(reqCtx intctrlutil.RequestCtx, expected, existing *parametersv1alpha1.ComponentParameter) (ctrl.Result, error) {
 	mergedObject := r.mergeComponentParameter(expected, existing)
+	if len(mergedObject.Spec.ConfigItemDetails) == 0 && len(existing.Spec.ConfigItemDetails) == 0 {
+		mergedObject.Spec.ConfigItemDetails = existing.Spec.ConfigItemDetails
+	}
 	if reflect.DeepEqual(mergedObject, existing) {
 		return intctrlutil.Reconciled()
 	}

Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,9 @@ func (r *ComponentDrivenParameterReconciler) delete(reqCtx intctrlutil.RequestCt`
`142`	`142`
`143`	`143`	`func (r ComponentDrivenParameterReconciler) update(reqCtx intctrlutil.RequestCtx, expected, existing parametersv1alpha1.ComponentParameter) (ctrl.Result, error) {`
`144`	`144`	`mergedObject := r.mergeComponentParameter(expected, existing)`
	`145`	`+ if len(mergedObject.Spec.ConfigItemDetails) == 0 && len(existing.Spec.ConfigItemDetails) == 0 {`
	`146`	`+ mergedObject.Spec.ConfigItemDetails = existing.Spec.ConfigItemDetails`
	`147`	`+ }`
`145`	`148`	`if reflect.DeepEqual(mergedObject, existing) {`
`146`	`149`	`return intctrlutil.Reconciled()`
`147`	`150`	`}`