Merge branch 'main' into support/instance-crd

leon-inf · leon-inf · commit ae7230fc3f77 · 2025-07-16T13:40:54.000+08:00
diff --git a/controllers/parameters/parameter_util.go b/controllers/parameters/parameter_util.go
@@ -164,12 +164,12 @@ func classifyParameters(updatedParameters parametersv1alpha1.ComponentParameters
 			rctx.ConfigRender,
 		)
 		if err != nil {
-			return err
+			return intctrlutil.NewFatalError(err.Error())
 		}
 		for tpl, m := range classParameters {
 			configDescs := intctrlutil.GetComponentConfigDescriptions(&rctx.ConfigRender.Spec, tpl)
 			if len(configDescs) == 0 {
-				return fmt.Errorf("not found config description from pdcr: %s", tpl)
+				return intctrlutil.NewFatalError(fmt.Sprintf("not found config description from pdcr: %s", tpl))
 			}
 			if err := validateComponentParameter(toArray(rctx.ParametersDefs), configDescs, m); err != nil {
 				return intctrlutil.NewFatalError(err.Error())

Original file line number	Diff line number	Diff line change
`@@ -164,12 +164,12 @@ func classifyParameters(updatedParameters parametersv1alpha1.ComponentParameters`
`164`	`164`	`rctx.ConfigRender,`
`165`	`165`	`)`
`166`	`166`	`if err != nil {`
`167`		`- return err`
	`167`	`+ return intctrlutil.NewFatalError(err.Error())`
`168`	`168`	`}`
`169`	`169`	`for tpl, m := range classParameters {`
`170`	`170`	`configDescs := intctrlutil.GetComponentConfigDescriptions(&rctx.ConfigRender.Spec, tpl)`
`171`	`171`	`if len(configDescs) == 0 {`
`172`		`- return fmt.Errorf("not found config description from pdcr: %s", tpl)`
	`172`	`+ return intctrlutil.NewFatalError(fmt.Sprintf("not found config description from pdcr: %s", tpl))`
`173`	`173`	`}`
`174`	`174`	`if err := validateComponentParameter(toArray(rctx.ParametersDefs), configDescs, m); err != nil {`
`175`	`175`	`return intctrlutil.NewFatalError(err.Error())`