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

openshift-merge-bot[bot] · web-flow · commit 6f91d84793b5 · 2025-08-15T20:51:05.000Z
NO-ISSUE: Synchronize From Upstream Repositories
diff --git a/commitchecker.yaml b/commitchecker.yaml
@@ -1,4 +1,4 @@
-expectedMergeBase: 3ad622560d7872e336943a22b8e70923d2dc9c07
+expectedMergeBase: 0e0e70605e09910fca8cb701c9e9b436c0f23826
 upstreamBranch: main
 upstreamOrg: operator-framework
 upstreamRepo: operator-controller
diff --git a/internal/shared/util/testutils/summary.go b/internal/shared/util/testutils/summary.go
@@ -160,7 +160,7 @@ func executeTemplate(templateFile string, obj any) (string, error) {
 	if err != nil {
 		return "", fmt.Errorf("failed to get working directory: %w", err)
 	}
-	tmpl, err := template.New(templateFile).ParseGlob(filepath.Join(wd, "../utils/templates", templateFile))
+	tmpl, err := template.New(templateFile).ParseGlob(filepath.Join(wd, "../../internal/shared/util/testutils/templates", templateFile))
 	if err != nil {
 		return "", err
 	}

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ func executeTemplate(templateFile string, obj any) (string, error) {`
`160`	`160`	`if err != nil {`
`161`	`161`	`return "", fmt.Errorf("failed to get working directory: %w", err)`
`162`	`162`	`}`
`163`		`- tmpl, err := template.New(templateFile).ParseGlob(filepath.Join(wd, "../utils/templates", templateFile))`
	`163`	`+ tmpl, err := template.New(templateFile).ParseGlob(filepath.Join(wd, "../../internal/shared/util/testutils/templates", templateFile))`
`164`	`164`	`if err != nil {`
`165`	`165`	`return "", err`
`166`	`166`	`}`