Merge pull request #37 from valdar/alignment

Default deploy action to SortByApplyOrder and remove silent StopError swallowing

Author: den-rgb

framework/controller/actions/deploy/action_deploy.go

@@ -164,8 +164,9 @@ func WithSortFn(fn SortFn) ActionOpts {
 	}
 }
 
-// WithApplyOrder is a convenience option that sorts resources into
-// dependency order (CRDs first, webhooks last) before deploying.
+// WithApplyOrder explicitly sets SortByApplyOrder as the sort function.
+// This is now the default for NewAction, so callers only need this if
+// the default was previously overridden by WithSortFn(nil).
 func WithApplyOrder() ActionOpts {
 	return WithSortFn(resources.SortByApplyOrder)
 }
@@ -617,6 +618,7 @@ func NewAction(opts ...ActionOpts) actions.Fn {
 		partOfLabelDefault:    DefaultPartOfLabelValue,
 		annotationPrefix:      DefaultAnnotationPrefix,
 		managedByAnnotation:   DefaultManagedByAnnotation,
+		sortFn:                resources.SortByApplyOrder,
 		applyCustomizers: map[schema.GroupVersionKind]CustomizerFn{
 			gvk.Deployment:             CustomizerFnApplyDeployments,
 			gvk.ClusterRole:            CustomizerFnApplyClusterRoles,

framework/controller/reconciler/reconciler.go

@@ -524,11 +524,6 @@ func (r *Reconciler) apply(ctx context.Context, res api.PlatformObject) (time.Du
 	}
 
 	if provisionErr != nil {
-		se := odherrors.StopError{}
-		if errors.As(provisionErr, &se) {
-			return 0, nil
-		}
-
 		r.Recorder.Eventf(
 			res,
 			nil,