Merge pull request #381 from openshift-bot/synchronize-upstream

openshift-merge-bot[bot] · web-flow · commit 0b44e8ce155a · 2025-06-12T02:57:24.000Z
NO-ISSUE: Synchronize From Upstream Repositories
diff --git 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
@@ -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))

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ func shouldSkipPreflight(ctx context.Context, preflight Preflight, ext *ocv1.Clu`
`91`	`91`	`func (h Helm) runPreAuthorizationChecks(ctx context.Context, ext ocv1.ClusterExtension, chart *chart.Chart, values chartutil.Values, post postrender.PostRenderer) error {`
`92`	`92`	`tmplRel, err := h.renderClientOnlyRelease(ctx, ext, chart, values, post)`
`93`	`93`	`if err != nil {`
`94`		`- return fmt.Errorf("failed to get release state using client-only dry-run: %w", err)`
	`94`	`+ return fmt.Errorf("error rendering content for pre-authorization checks: %w", err)`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`missingRules, authErr := h.PreAuthorizer.PreAuthorize(ctx, ext, strings.NewReader(tmplRel.Manifest))`