Skip to content

NO-ISSUE: Synchronize From Upstream Repositories #381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 31 commits into from
Jun 12, 2025
Merged

NO-ISSUE: Synchronize From Upstream Repositories #381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
0c9f0b5
(pre-flight check) Improve error message (#2006)
anik120 Jun 11, 2025
119e2d6
Merge branch 'main' into synchronize
Jun 12, 2025
494880e
UPSTREAM: <carry>: Add OpenShift specific files
dtfranz Oct 26, 2023
2d056c2
UPSTREAM: <carry>: Fix catalogd.Dockerfile to use new paths
tmshort Feb 26, 2025
213e236
UPSTREAM: <carry>: Update DOWNSTREAM_OWNERS_ALIASES
tmshort Mar 6, 2025
9b46783
UPSTREAM: <carry>: Add openshift node selector annotation
oceanc80 Mar 26, 2025
d43eba2
UPSTREAM: <carry>: Add caalogd-cas-dir option to op-con
tmshort Apr 15, 2025
2e5fc08
UPSTREAM: <carry>: set the SElinux type
jianzhangbjz Apr 27, 2025
3ad0957
UPSTREAM: <carry>: Add initial stack to run tests to validate the cat…
camilamacedo86 Apr 17, 2025
148034d
UPSTREAM: <carry>: Add vendor files for the catalog-sync tests
camilamacedo86 Apr 17, 2025
d9af564
UPSTREAM: <carry>: Bump catalog versions to 4.19
tmshort Apr 24, 2025
da427cb
UPSTREAM: <carry>: revert "Bump catalog versions to 4.19"
tmshort May 15, 2025
0d66d94
UPSTREAM: <carry>: Update HOWTO-origin-tests
tmshort May 14, 2025
9c1b6e3
UPSTREAM: <carry>: [DefaultCatalogTests]: Allow to pass auth path for…
camilamacedo86 May 16, 2025
a633484
UPSTREAM: <carry>: fix: set NoLchown=true to allow image unpack on OCPci
camilamacedo86 May 19, 2025
b897d55
UPSTREAM: <carry>: [DefaultCatalogTests]: Moving parse of ENVVAR to t…
camilamacedo86 May 17, 2025
950de67
UPSTREAM: <carry>: [Default Catalog]: Create tmp dir to extract layer…
camilamacedo86 May 20, 2025
a70ea80
UPSTREAM: <carry>: [Default Catalog](cleanp) Remove hack directory wh…
camilamacedo86 May 19, 2025
274fa68
UPSTREAM: <carry>: Change code implementation to extract layers in OC…
camilamacedo86 May 21, 2025
8413d06
UPSTREAM: <carry>: Add vendor files for change in the extract code im…
camilamacedo86 May 21, 2025
dddb548
UPSTREAM: <carry>: [Default Catalog Tests]: Final cleanups and enhanc…
camilamacedo86 May 22, 2025
f4d62e5
UPSTREAM: <carry>: SELinux type for operator-controller
jianzhangbjz May 22, 2025
ad33d2c
UPSTREAM: <carry>: Bump catalog versions to 4.19
tmshort Apr 24, 2025
a710fc1
UPSTREAM: <carry>: [Default Catalog Consistency Test] (feat) add chec…
camilamacedo86 May 28, 2025
57ed04e
UPSTREAM: <carry>: [Default Catalog Consistency Test]: fix junit outp…
camilamacedo86 Jun 2, 2025
3f4316f
UPSTREAM: <carry>: [Default Catalog Consistency Test] (feat) add chec…
camilamacedo86 May 29, 2025
d4a6742
UPSTREAM: <carry>: [Default Catalog Consistency Test]: Enable Catalog…
camilamacedo86 Jun 4, 2025
b173f2f
UPSTREAM: <carry>: [Default Catalog Consistency Test]: Rename Tests s…
camilamacedo86 Jun 4, 2025
adadf03
UPSTREAM: <drop>: go mod vendor
Jun 12, 2025
e930717
UPSTREAM: <drop>: remove upstream GitHub configuration
Jun 12, 2025
8705741
UPSTREAM: <drop>: configure the commit-checker
Jun 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion commitchecker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
expectedMergeBase: b152c7b294de6ebe3ea0ef2daf575d1f540014da
expectedMergeBase: 0c9f0b529d50666f0bd28cb6e34fecf090076235
upstreamBranch: main
upstreamOrg: operator-framework
upstreamRepo: operator-controller
2 changes: 1 addition & 1 deletion internal/operator-controller/applier/helm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down