Skip to content

NO-ISSUE: Synchronize From Upstream Repositories #473

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
openshift-merge-bot merged 77 commits into from
Sep 15, 2025
Merged

NO-ISSUE: Synchronize From Upstream Repositories #473

Changes from 1 commit
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
8762ed5
:seedling: Bump github.com/operator-framework/operator-registry (#2217)
dependabot[bot] Sep 12, 2025
c73b6e0
Add more probing to CER (#2210)
thetechnick Sep 12, 2025
4867f92
promote rukpak hash util to shared package, use in boxcutter applier …
joelanford Sep 12, 2025
823aeaa
Merge branch 'main' into synchronize
Sep 15, 2025
b847e83
UPSTREAM: <carry>: Add OpenShift specific files
dtfranz Oct 26, 2023
c8c9430
UPSTREAM: <carry>: Fix catalogd.Dockerfile to use new paths
tmshort Feb 26, 2025
5280355
UPSTREAM: <carry>: Update DOWNSTREAM_OWNERS_ALIASES
tmshort Mar 6, 2025
2341c83
UPSTREAM: <carry>: Add openshift node selector annotation
oceanc80 Mar 26, 2025
c56f044
UPSTREAM: <carry>: Add caalogd-cas-dir option to op-con
tmshort Apr 15, 2025
96fa2dd
UPSTREAM: <carry>: set the SElinux type
jianzhangbjz Apr 27, 2025
1066409
UPSTREAM: <carry>: Add initial stack to run tests to validate the cat…
camilamacedo86 Apr 17, 2025
03ff337
UPSTREAM: <carry>: Add vendor files for the catalog-sync tests
camilamacedo86 Apr 17, 2025
510ed25
UPSTREAM: <carry>: Bump catalog versions to 4.19
tmshort Apr 24, 2025
56084ad
UPSTREAM: <carry>: revert "Bump catalog versions to 4.19"
tmshort May 15, 2025
988c0ec
UPSTREAM: <carry>: Update HOWTO-origin-tests
tmshort May 14, 2025
016cf54
UPSTREAM: <carry>: [DefaultCatalogTests]: Allow to pass auth path for…
camilamacedo86 May 16, 2025
57cbe71
UPSTREAM: <carry>: fix: set NoLchown=true to allow image unpack on OCPci
camilamacedo86 May 19, 2025
6344291
UPSTREAM: <carry>: [DefaultCatalogTests]: Moving parse of ENVVAR to t…
camilamacedo86 May 17, 2025
afa7931
UPSTREAM: <carry>: [Default Catalog]: Create tmp dir to extract layer…
camilamacedo86 May 20, 2025
8bd8a5b
UPSTREAM: <carry>: [Default Catalog](cleanp) Remove hack directory wh…
camilamacedo86 May 19, 2025
0cdacc0
UPSTREAM: <carry>: Change code implementation to extract layers in OC…
camilamacedo86 May 21, 2025
6aee70f
UPSTREAM: <carry>: Add vendor files for change in the extract code im…
camilamacedo86 May 21, 2025
15e6f15
UPSTREAM: <carry>: [Default Catalog Tests]: Final cleanups and enhanc…
camilamacedo86 May 22, 2025
4a8b765
UPSTREAM: <carry>: SELinux type for operator-controller
jianzhangbjz May 22, 2025
a6fab86
UPSTREAM: <carry>: Bump catalog versions to 4.19
tmshort Apr 24, 2025
212521f
UPSTREAM: <carry>: [Default Catalog Consistency Test] (feat) add chec…
camilamacedo86 May 28, 2025
8fa47e3
UPSTREAM: <carry>: [Default Catalog Consistency Test]: fix junit outp…
camilamacedo86 Jun 2, 2025
06e4041
UPSTREAM: <carry>: [Default Catalog Consistency Test] (feat) add chec…
camilamacedo86 May 29, 2025
0d1c95a
UPSTREAM: <carry>: [Default Catalog Consistency Test]: Enable Catalog…
camilamacedo86 Jun 4, 2025
d6de364
UPSTREAM: <carry>: [Default Catalog Consistency Test]: Rename Tests s…
camilamacedo86 Jun 4, 2025
bfc85ac
UPSTREAM: <carry>: Updating ose-olm-operator-controller-container ima…
Jun 18, 2025
3c5330f
UPSTREAM: <carry>: Updating ose-olm-catalogd-container image to be co…
Jun 18, 2025
e5f093e
UPSTREAM: <carry>: Update e2e registry to use 1.24/4.20
tmshort Jun 30, 2025
5e8e76a
UPSTREAM: <carry>: [Catalog Default Tests]: Upgrade go version to 1.2…
camilamacedo86 Jul 1, 2025
e786caa
UPSTREAM: <carry>: Add structure to allow move the orgin tests using OTE
camilamacedo86 Jun 13, 2025
24ac744
UPSTREAM: <carry>: Add support for experimental manifests
tmshort Jul 2, 2025
36a8a30
UPSTREAM: <carry>: [OTE] - chore: follow up #383 – remove unreachable…
camilamacedo86 Jul 10, 2025
40156c6
UPSTREAM: <carry>: Remove build of test image registry
tmshort Jul 9, 2025
1b68f84
UPSTREAM: <carry>: Add test-experimental-e2e target to openshift Make…
tmshort Jul 15, 2025
9cbe797
UPSTREAM: <carry>: [OTE]: Add binary in the operator controller image…
camilamacedo86 Jul 11, 2025
791db71
UPSTREAM: <carry>: Fix experimental manifest copying
tmshort Jul 17, 2025
3f248ef
UPSTREAM: <carry>: Update manifest generation for upstream rbac/webhooks
tmshort Jul 17, 2025
526a66d
UPSTREAM: <carry>: [OTE] - Add tracking mechanism
camilamacedo86 Jul 17, 2025
5a06ccb
UPSTREAM: <carry>: Update OTE dep to get fix
camilamacedo86 Jul 22, 2025
49d8348
UPSTREAM: <carry>: [OTE] Add Readme
camilamacedo86 Jul 24, 2025
4aebe68
UPSTREAM: <carry>: set GIT_COMMIT env from SOURCE_GIT_COMMIT in Docke…
rashmigottipati Jun 6, 2025
3b289f9
UPSTREAM: <carry>: add openshift specific build target to pass commit…
ankitathomas Jun 11, 2025
aabfce4
UPSTREAM: <carry>: add source commit into binaries when linking
bentito Jul 9, 2025
1faf39d
UPSTREAM: <carry>: OTE add first test from openshift/origin olmv1.go
camilamacedo86 Jul 19, 2025
a505de6
UPSTREAM: <carry>: Migrate tasks from openshift/origin olm v1.go file…
camilamacedo86 Jul 31, 2025
91a9617
UPSTREAM: <carry>: OTE - How to test locally with OCP instances
camilamacedo86 Aug 6, 2025
b8a9ed7
UPSTREAM: <carry>: [OTE] Refac: refac helper and olmv1 test to create…
camilamacedo86 Aug 8, 2025
688cc22
UPSTREAM: <carry>: [OTE] add webhook tests
camilamacedo86 Jul 31, 2025
26a8d7a
UPSTREAM: <carry>: OTE: rewrite the upgrade incompatible operator test
tmshort Aug 11, 2025
4b25cb8
UPSTREAM: <carry>: Handle service-ca cert availability/rotation
tmshort Aug 15, 2025
68b2746
UPSTREAM: <carry>: [OTE] add webhook tests
sosiouxme Aug 14, 2025
9f30aa2
UPSTREAM: <carry>: Upgrade OCP Catalog images from 4.19 to 4.20
camilamacedo86 Aug 13, 2025
9863f20
UPSTREAM: <carry>: Remove bindata generation from build
tmshort Aug 15, 2025
f25c88c
UPSTREAM: <carry>: [OTE] Add webhook tests
camilamacedo86 Aug 13, 2025
7e2298e
UPSTREAM: <carry>: OTE add logs and dumps for olmv1 test and fix help…
camilamacedo86 Aug 15, 2025
8cf6304
UPSTREAM: <carry>: [OTE] Migrate preflight checks from openshift/origin
camilamacedo86 Jul 31, 2025
ca98999
UPSTREAM: <carry>: [OTE] Add webhook to validate openshift-service-ca…
camilamacedo86 Aug 13, 2025
5d8a15e
UPSTREAM: <carry>: Adds ResourceVersion checks to the tls secret dele…
camilamacedo86 Aug 21, 2025
270bd12
UPSTREAM: <carry>: [OTE] - Readme:Add info to help use payload-aggreg…
camilamacedo86 Aug 20, 2025
4c54a94
UPSTREAM: <carry>: remove obsolete owners
grokspawn Aug 21, 2025
d726bca
UPSTREAM: <carry>: [OTE] add catalog tests from openshift/origin
camilamacedo86 Jul 31, 2025
4143ecb
UPSTREAM: <carry>: Migrate single/own namespace tests
camilamacedo86 Aug 8, 2025
a28eb45
UPSTREAM: <carry>: Adds ResourceVersion checks to the tls secret dele…
neisw Aug 25, 2025
bb17a52
UPSTREAM: <carry>: Ensure unique name for bad-catalog tests
camilamacedo86 Aug 27, 2025
78c4dff
UPSTREAM: <carry>: Revert "Handle service-ca cert availability/rotation"
tmshort Aug 29, 2025
76580b4
UPSTREAM: <carry>: grant QE approver permission for OTE
jianzhangbjz Aug 27, 2025
9310360
UPSTREAM: <carry>: Update webhook ote tests to use latest webhook-ope…
Sep 4, 2025
0a29fab
UPSTREAM: <carry>: update operator-controller to v1.5.1
anik120 Sep 11, 2025
3fdb008
UPSTREAM: <carry>: configure watchnamespace using spec.config for OTE…
anik120 Sep 11, 2025
1d5a428
UPSTREAM: <drop>: go mod vendor
Sep 15, 2025
6e66d65
UPSTREAM: <drop>: remove upstream GitHub configuration
Sep 15, 2025
1122522
UPSTREAM: <drop>: configure the commit-checker
Sep 15, 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
Prev Previous commit
Next Next commit
UPSTREAM: <carry>: Fix catalogd.Dockerfile to use new paths 
The root catalogd directory has been removed

Signed-off-by: Todd Short <todd.short@me.com>
  • Loading branch information
@tmshort
tmshort authored and ci-robot committed Sep 15, 2025
commit c8c9430ab142adbf8b6e5a68382193a090eff8d6
4 changes: 2 additions & 2 deletions openshift/catalogd.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
WORKDIR /build
COPY . .
RUN make -C catalogd go-build-local
RUN make go-build-local

FROM registry.ci.openshift.org/ocp/4.19:base-rhel9
USER 1001
COPY --from=builder /build/catalogd/bin/catalogd /catalogd
COPY --from=builder /build/bin/catalogd /catalogd
COPY openshift/catalogd/manifests /openshift/manifests

LABEL io.k8s.display-name="OpenShift Operator Lifecycle Manager Catalog Controller" \
Expand Down