OADP: migrate CI to OO_BUNDLE (FBC) + enable TechPreview for OLMv1/VolumeGroupSnapshot testing#79152
OADP: migrate CI to OO_BUNDLE (FBC) + enable TechPreview for OLMv1/VolumeGroupSnapshot testing#79152kaovilai wants to merge 1 commit into
Conversation
WalkthroughMultiple OADP CI YAMLs were updated to build and publish a named bundle ( Changes
Estimated code review effort🎯 4 (Complex) | ⏱️ ~45 minutes 🚥 Pre-merge checks | ✅ 12✅ Passed checks (12 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
|
/pj-rehearse auto-ack |
|
@kaovilai: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
There was a problem hiding this comment.
Pull request overview
Migrates the OADP operator variant ci-operator configs from the deprecated index-image-based optional-operators workflow (OO_INDEX / optional-operators-ci-aws) to the operator-sdk bundle workflow (OO_BUNDLE / optional-operators-ci-operator-sdk-aws) to avoid upcoming ci-operator index build removal.
Changes:
- Define a named operator bundle (
as: oadp-operator-bundle) and setskip_building_index: truein each variant config. - Switch test dependencies from
OO_INDEX: ci-indextoOO_BUNDLE: oadp-operator-bundle. - Update workflows to
optional-operators-ci-operator-sdk-awsand replace channel/package/target namespace env withOO_INSTALL_MODE: OwnNamespace.
Reviewed changes
Copilot reviewed 15 out of 15 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__5.0.yaml | Switch OADP dev 5.0 CI to operator-sdk bundle workflow and bundle dependency. |
| ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__4.23.yaml | Switch OADP dev 4.23 CI to operator-sdk bundle workflow and bundle dependency. |
| ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__4.22.yaml | Switch OADP dev 4.22 CI to operator-sdk bundle workflow and bundle dependency. |
| ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__5.0.yaml | Switch OADP 1.6 5.0 CI to operator-sdk bundle workflow and bundle dependency. |
| ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__4.22.yaml | Switch OADP 1.6 4.22 CI to operator-sdk bundle workflow and bundle dependency. |
| ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__4.18.yaml | Switch OADP 1.6 4.18 CI to operator-sdk bundle workflow and bundle dependency. |
| ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5__4.20.yaml | Switch OADP 1.5 4.20 CI to operator-sdk bundle workflow and bundle dependency. |
| ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5__4.19.yaml | Switch OADP 1.5 4.19 CI to operator-sdk bundle workflow and bundle dependency. |
| ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4__4.18.yaml | Switch OADP 1.4 4.18 CI to operator-sdk bundle workflow and bundle dependency. |
| ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.15.yaml | Switch OADP 1.3 4.15 CI to operator-sdk bundle workflow and bundle dependency. |
| ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.14.yaml | Switch OADP 1.3 4.14 CI to operator-sdk bundle workflow and bundle dependency. |
| ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.13.yaml | Switch OADP 1.3 4.13 CI to operator-sdk bundle workflow and bundle dependency. |
| ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.12.yaml | Switch OADP 1.3 4.12 CI to operator-sdk bundle workflow and bundle dependency. |
| ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0__4.14.yaml | Switch OADP 1.0 4.14 CI to operator-sdk bundle workflow and bundle dependency. |
| ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0__4.12.yaml | Switch OADP 1.0 4.12 CI to operator-sdk bundle workflow and bundle dependency. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
|
@kaovilai can you just delete any oadp-1.0.x files, we don't need to update them. We only need OADP-1.3+ |
|
its just for sanity.. :/ |
|
nuke a few more old jobs I think iiuc |
|
/pj-rehearse auto-ack |
|
@kaovilai: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
/retest |
|
/pj-rehearse auto-ack |
|
@kaovilai: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
/retest |
|
/pj-rehearse auto-ack |
|
@kaovilai: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
@kaovilai: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
@kaovilai, Interacting with pj-rehearseComment: Once you are satisfied with the results of the rehearsals, comment: |
ad92ffb to
d3b9037
Compare
d84cd4d to
42713c8
Compare
Migrate all oadp-operator variant CI configs from deprecated index image path to operator-sdk bundle workflow. Also removes EOL oadp-1.0 variant configs and enables TechPreview for OCP 4.22+ testing. Changes per config: - operator.bundles: add as: oadp-operator-bundle + skip_building_index - base_images: add cli-operator-sdk (not in OCP release payload) - dependencies: OO_INDEX: ci-index -> OO_BUNDLE: oadp-operator-bundle - workflow: optional-operators-ci-aws -> optional-operators-ci-operator-sdk-aws - env: replace OO_CHANNEL/OO_PACKAGE/OO_TARGET_NAMESPACES with OO_INSTALL_MODE: OwnNamespace TechPreviewNoUpgrade (OCP 4.22+ configs only): - Enables NewOLMOwnSingleNamespace gate for OLMv1 OwnNamespace support - Enables VolumeGroupSnapshot-based backup/restore testing Unblocks: openshift/oadp-operator#2160 Generated with [Claude Code](https://claude.ai/code) via [Happy](https://happy.engineering) Co-Authored-By: Claude <noreply@anthropic.com> Co-Authored-By: Happy <yesreply@happy.engineering> Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
02ac106 to
878dec1
Compare
|
[REHEARSALNOTIFIER]
A total of 80 jobs have been affected by this change. The above listing is non-exhaustive and limited to 25 jobs. A full list of affected jobs can be found here Interacting with pj-rehearseComment: Once you are satisfied with the results of the rehearsals, comment: |
|
/pj-rehearse pull-ci-openshift-oadp-operator-oadp-1.3-4.12-ci-bundle-oadp-operator-bundle pull-ci-openshift-oadp-operator-oadp-1.3-4.13-ci-bundle-oadp-operator-bundle pull-ci-openshift-oadp-operator-oadp-1.3-4.14-ci-bundle-oadp-operator-bundle pull-ci-openshift-oadp-operator-oadp-1.3-4.15-ci-bundle-oadp-operator-bundle pull-ci-openshift-oadp-operator-oadp-1.4-4.18-ci-bundle-oadp-operator-bundle pull-ci-openshift-oadp-operator-oadp-1.5-4.19-ci-bundle-oadp-operator-bundle pull-ci-openshift-oadp-operator-oadp-1.5-4.19-images pull-ci-openshift-oadp-operator-oadp-1.5-4.20-ci-bundle-oadp-operator-bundle pull-ci-openshift-oadp-operator-oadp-1.5-4.20-images pull-ci-openshift-oadp-operator-oadp-1.5-unit-test pull-ci-openshift-oadp-operator-oadp-1.6-4.18-ci-bundle-oadp-operator-bundle pull-ci-openshift-oadp-operator-oadp-1.6-4.18-images pull-ci-openshift-oadp-operator-oadp-1.6-4.22-ci-bundle-oadp-operator-bundle pull-ci-openshift-oadp-operator-oadp-1.6-4.22-images pull-ci-openshift-oadp-operator-oadp-1.6-5.0-ci-bundle-oadp-operator-bundle pull-ci-openshift-oadp-operator-oadp-1.6-5.0-images pull-ci-openshift-oadp-operator-oadp-1.6-unit-test pull-ci-openshift-oadp-operator-oadp-dev-4.22-ci-bundle-oadp-operator-bundle pull-ci-openshift-oadp-operator-oadp-dev-4.23-ci-bundle-oadp-operator-bundle pull-ci-openshift-oadp-operator-oadp-dev-5.0-ci-bundle-oadp-operator-bundle pull-ci-openshift-oadp-operator-oadp-dev-4.22-e2e-test-aws pull-ci-openshift-oadp-operator-oadp-dev-4.22-e2e-test-cli-aws pull-ci-openshift-oadp-operator-oadp-dev-4.22-images pull-ci-openshift-oadp-operator-oadp-1.3-4.14-e2e-test-aws pull-ci-openshift-oadp-operator-oadp-1.3-4.14-images |
|
@kaovilai: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
Note on oadp-1.0 job files remainingThe oadp-1.0 variant configs ( Why: The default config To fully remove oadp-1.0 jobs, the default config Note Responses generated with Claude |
|
@kaovilai: The following tests failed, say
Full PR test history. Your PR dashboard. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
weshayutin
left a comment
There was a problem hiding this comment.
so @kaovilai channel is no longer needed? maybe something you can explain later :)
|
Depends on #79324 — fixes a bug where Note Responses generated with Claude |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: Joeavaikath, kaovilai, shubham-pampattiwar, weshayutin The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
@weshayutin Correct — Old flow ( New flow ( Think of it as: old = "install package X from channel Y in catalog Z" vs new = "install this exact bundle image". Note Responses generated with Claude |
|
It has been advised by folks in the know to not even touch this piece of code called Operator SDK, so looking at alternatives at the moment. |
|
Note Responses generated with Claude FBC Catalog Dockerfile Research — for follow-up PRsWe're moving away from the The Dockerfile
Key detail: must set CI config changes needed (replaces this PR's approach)For each variant config, the diff from current (not from this PR) would be: # KEEP as-is:
operator:
bundles:
- as: oadp-operator-bundle # add 'as' name
dockerfile_path: build/Dockerfile.bundle
skip_building_index: true # add: don't build deprecated ci-index
substitutions:
- pullspec: quay.io/konveyor/oadp-operator:latest
with: oadp-operator
# ADD to images stanza:
images:
- dockerfile_path: build/Dockerfile.catalog
build_args:
- name: BUNDLE_IMG
value: pipeline:oadp-operator-bundle # ⚠️ needs verification, see below
to: oadp-operator-catalog
# CHANGE in each test's steps:
dependencies:
OO_INDEX: oadp-operator-catalog # was: ci-index
env:
OO_CHANNEL: dev # KEEP (was removed in this PR)
OO_INSTALL_NAMESPACE: openshift-adp # KEEP
OO_PACKAGE: oadp-operator # KEEP (was removed in this PR)
OO_TARGET_NAMESPACES: '!install' # KEEP (was removed in this PR)
FEATURE_SET: TechPreviewNoUpgrade # KEEP from this PR (4.22+ only)
workflow: optional-operators-ci-aws # KEEP original (not operator-sdk variant)
# REMOVE (no longer needed):
# - base_images.cli-operator-sdkOpen question:
|
| Operator | Approach | Link |
|---|---|---|
| coraza-kubernetes-operator | ARG BUNDLE_IMGS + opm render in Dockerfile (closest to ours) |
catalog/Dockerfile |
| Quay operator | Custom CI step script, creates CatalogSource from env var | step-registry |
| OCS operator | Uses deprecated ci-index auto-generation |
ci config |
|
Superseded by #79327 — same migration (FBC + TechPreview + oadp-1.0 deletion) but without Depends on openshift/oadp-operator#2204 for Note Responses generated with Claude |
Summary
Migrate all oadp-operator variant CI configs from the deprecated index image path (
OO_INDEX: ci-index+optional-operators-ci-aws) to the recommended operator-sdk bundle workflow (OO_BUNDLE+optional-operators-ci-operator-sdk-aws). Also removes EOL oadp-1.0 variant configs entirely.Changes per config:
operator.bundles: addas: oadp-operator-bundle+skip_building_index: truebase_images: addcli-operator-sdk(required by operator-sdk workflow, not in OCP release payload)dependencies:OO_INDEX: ci-index→OO_BUNDLE: oadp-operator-bundleworkflow:optional-operators-ci-aws→optional-operators-ci-operator-sdk-awsenv: replaceOO_CHANNEL/OO_PACKAGE/OO_TARGET_NAMESPACESwithOO_INSTALL_MODE: OwnNamespaceTechPreviewNoUpgrade for OCP 4.22+ configs (oadp-1.6, oadp-dev):
FEATURE_SET: TechPreviewNoUpgradeto all test env blocks targeting OCP 4.22+NewOLMOwnSingleNamespacefeature gate (TechPreview-only on all current OCP branches) is required for OLMv1 to supportOwnNamespaceinstall mode. Without it, OLMv1 rejects bundles that don't declareAllNamespaces. This enables CI testing of OLMv1 lifecycle tests (fresh install, OLMv0→OLMv1 migration)Migrated configs (13 files):
oadp-1.3(4.12, 4.13, 4.14, 4.15)oadp-1.4(4.18)oadp-1.5(4.19, 4.20)oadp-1.6(4.18, 4.22, 5.0)oadp-dev(4.22, 4.23, 5.0)Deleted configs (2 files):
oadp-1.0(4.12, 4.14) — EOL, no longer neededWhy FBC migration:
Since OCP 4.11+, index images are file-based catalogs (FBC) which are incompatible with ci-operator's legacy index image building. Building index images is deprecated and will be removed from ci-operator. The recommended replacement is
operator-sdk run bundlevia theoptional-operators-ci-operator-sdk-awsworkflow, which works with both legacy and FBC index formats.See also: Moving to File-Based Catalog
Unblocks: openshift/oadp-operator#2160
Note
Responses generated with Claude