diff --git a/commitchecker.yaml b/commitchecker.yaml index c622eadb0..155df2f96 100644 --- a/commitchecker.yaml +++ b/commitchecker.yaml @@ -1,4 +1,4 @@ -expectedMergeBase: b152c7b294de6ebe3ea0ef2daf575d1f540014da +expectedMergeBase: 0c9f0b529d50666f0bd28cb6e34fecf090076235 upstreamBranch: main upstreamOrg: operator-framework upstreamRepo: operator-controller diff --git a/internal/operator-controller/applier/helm.go b/internal/operator-controller/applier/helm.go index cc47cc5a3..6b3af506f 100644 --- a/internal/operator-controller/applier/helm.go +++ b/internal/operator-controller/applier/helm.go @@ -91,7 +91,7 @@ func shouldSkipPreflight(ctx context.Context, preflight Preflight, ext *ocv1.Clu func (h *Helm) runPreAuthorizationChecks(ctx context.Context, ext *ocv1.ClusterExtension, chart *chart.Chart, values chartutil.Values, post postrender.PostRenderer) error { tmplRel, err := h.renderClientOnlyRelease(ctx, ext, chart, values, post) if err != nil { - return fmt.Errorf("failed to get release state using client-only dry-run: %w", err) + return fmt.Errorf("error rendering content for pre-authorization checks: %w", err) } missingRules, authErr := h.PreAuthorizer.PreAuthorize(ctx, ext, strings.NewReader(tmplRel.Manifest))