OADP: migrate CI to FBC catalog image (no operator-sdk) + TechPreview#79327
OADP: migrate CI to FBC catalog image (no operator-sdk) + TechPreview#79327kaovilai wants to merge 1 commit into
Conversation
Migrate all oadp-operator variant CI configs from deprecated index image path (OO_INDEX: ci-index) to FBC catalog image built via Dockerfile.catalog (OO_INDEX: oadp-operator-catalog). This avoids operator-sdk dependency entirely, using only opm (actively maintained by OLM team). Changes per config: - operator.bundles: add as: oadp-operator-bundle + skip_building_index: true - images: add Dockerfile.catalog build → oadp-operator-catalog - dependencies: OO_INDEX: ci-index → OO_INDEX: oadp-operator-catalog - env: restore OO_CHANNEL/OO_PACKAGE/OO_TARGET_NAMESPACES - workflow: keep optional-operators-ci-aws (not operator-sdk variant) TechPreviewNoUpgrade for OCP 4.22+ configs (oadp-1.6, oadp-dev): - FEATURE_SET: TechPreviewNoUpgrade enables OLMv1 OwnNamespace support - Enables VolumeGroupSnapshot backup/restore testing CustomNoUpgrade for oadp-1.4 4.18 (existing behavior preserved). Deleted EOL configs: oadp-1.0 (4.12, 4.14) Depends on: openshift/oadp-operator#2204 (Dockerfile.catalog) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: kaovilai 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 |
openshift-ci
Bot
added
the
approved
WalkthroughThis PR removes two complete oadp-1.0 branch CI configurations (4.12 and 4.14) and updates nine release-branch configurations across OADP operator versions 1.3–1.6 and dev to build FBC catalog images, refactor operator bundle definitions, and redirect test job dependencies to use the new catalog image index instead of ci-index, with feature flags added in newer versions. ChangesOADP operator CI catalog and bundle migration
Estimated code review effort🎯 2 (Simple) | ⏱️ ~10 minutes Possibly related issues
Suggested labels
Suggested reviewers
🚥 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 |
|
[REHEARSALNOTIFIER]
A total of 78 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: |
|
@kaovilai: all tests passed! 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. |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In
`@ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__4.22.yaml`:
- Around line 8-12: The BUNDLE_IMG build-arg in build_args currently uses the
unresolved alias "oadp-operator-bundle"; change its value to a pipeline image
reference (e.g., "pipeline:oadp-operator-bundle") or a full pullspec so the
build/Dockerfile.catalog receives a resolvable image and opm render won't fail;
update the build_args entry for name: BUNDLE_IMG accordingly and ensure any
downstream usage in Dockerfile.catalog or opm render expects the pipeline:...
form.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Central YAML (inherited)
Review profile: CHILL
Plan: Enterprise
Run ID: acec6a56-5a39-4e95-ba5b-45dcd06aabf7
⛔ Files ignored due to path filters (12)
ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-periodics.yamlis excluded by!ci-operator/jobs/**ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-presubmits.yamlis excluded by!ci-operator/jobs/**ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3-periodics.yamlis excluded by!ci-operator/jobs/**ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3-presubmits.yamlis excluded by!ci-operator/jobs/**ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-periodics.yamlis excluded by!ci-operator/jobs/**ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-presubmits.yamlis excluded by!ci-operator/jobs/**ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5-periodics.yamlis excluded by!ci-operator/jobs/**ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5-presubmits.yamlis excluded by!ci-operator/jobs/**ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-periodics.yamlis excluded by!ci-operator/jobs/**ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-presubmits.yamlis excluded by!ci-operator/jobs/**ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-periodics.yamlis excluded by!ci-operator/jobs/**ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-presubmits.yamlis excluded by!ci-operator/jobs/**
📒 Files selected for processing (15)
ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0__4.12.yamlci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0__4.14.yamlci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.12.yamlci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.13.yamlci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.14.yamlci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.15.yamlci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4__4.18.yamlci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5__4.19.yamlci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5__4.20.yamlci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__4.18.yamlci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__4.22.yamlci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__5.0.yamlci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__4.22.yamlci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__4.23.yamlci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__5.0.yaml
💤 Files with no reviewable changes (2)
- ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0__4.12.yaml
- ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0__4.14.yaml
| - build_args: | ||
| - name: BUNDLE_IMG | ||
| value: oadp-operator-bundle | ||
| dockerfile_path: build/Dockerfile.catalog | ||
| to: oadp-operator-catalog |
There was a problem hiding this comment.
🧩 Analysis chain
🌐 Web query:
In OpenShift ci-operator config, does images[].build_args[].valueautomatically resolve pipeline image aliases (for exampleoadp-operator-bundle) to pullspecs during image builds? Please answer using official OpenShift CI documentation and examples.
💡 Result:
No, images[].build_args[].value does not automatically resolve pipeline image aliases like 'oadp-operator-bundle' to pullspecs during image builds. Official OpenShift CI documentation states that build_args values are taken directly from the 'value' field in the configuration and passed to the build to override Dockerfile defaults [1][2]. Examples show literal strings like 'okd' [1]. Image alias resolution (e.g., 'installer' to 'pipeline:installer') applies to specific fields like images[].from, tests[].container.from, but build_args is not listed among them [1]. OpenShift BuildConfig docs confirm buildArgs values are literal strings without alias resolution [3][4]. No examples or docs indicate resolution for build_args values, including in OADP operator repo [5][6].
Citations:
- 1: https://docs.ci.openshift.org/architecture/ci-operator/
- 2: https://docs.ci.openshift.org/docs/architecture/ci-operator/
- 3: https://docs.redhat.com/en/documentation/openshift_container_platform/4.20/html/builds_using_buildconfig/build-strategies
- 4: https://docs.okd.io/4.14/rest_api/workloads_apis/buildconfig-build-openshift-io-v1.html
- 5: https://github.com/openshift/oadp-operator/tree/master
- 6: https://github.com/openshift/oadp-operator
Use pipeline image references instead of aliases in build_args.
The BUNDLE_IMG build-arg uses the pipeline alias oadp-operator-bundle, which ci-operator does not resolve in build_args[].value. This literal string will be passed to build/Dockerfile.catalog, causing opm render to fail or reference an unintended image. Update the config to reference the image as pipeline:oadp-operator-bundle or use a full pullspec instead.
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In
`@ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__4.22.yaml`
around lines 8 - 12, The BUNDLE_IMG build-arg in build_args currently uses the
unresolved alias "oadp-operator-bundle"; change its value to a pipeline image
reference (e.g., "pipeline:oadp-operator-bundle") or a full pullspec so the
build/Dockerfile.catalog receives a resolvable image and opm render won't fail;
update the build_args entry for name: BUNDLE_IMG accordingly and ensure any
downstream usage in Dockerfile.catalog or opm render expects the pipeline:...
form.
|
PJ Rehearsal is blocked by openshift/oadp-operator#2204 merging — Note Responses generated with Claude |
|
/hold |
openshift-ci
Bot
added
the
do-not-merge/hold
1 participant
Summary
Alternative to #79152 that avoids
operator-sdkdependency entirely by building an FBC (File-Based Catalog) catalog image usingopm renderviabuild/Dockerfile.catalog(from openshift/oadp-operator#2204).Approach difference from #79152
operator-sdk run bundleoptional-operators-subscribevia CatalogSourceoptional-operators-ci-operator-sdk-awsoptional-operators-ci-aws(original)OO_BUNDLE+cli-operator-sdkbase imageOO_INDEXpointing to built FBC catalog imageoadp-operator-catalog(built fromDockerfile.catalog)Changes per config:
operator.bundles: addas: oadp-operator-bundle+skip_building_index: trueimages: addbuild/Dockerfile.catalogbuild withBUNDLE_IMGbuild arg →oadp-operator-catalogdependencies:OO_INDEX: ci-index→OO_INDEX: oadp-operator-catalogenv: restoreOO_CHANNEL/OO_PACKAGE/OO_TARGET_NAMESPACES(needed byoptional-operators-subscribe)workflow: keepoptional-operators-ci-aws(not operator-sdk variant)TechPreviewNoUpgrade for OCP 4.22+ configs (oadp-1.6, oadp-dev):
FEATURE_SET: TechPreviewNoUpgradeenables OLMv1OwnNamespacesupport viaNewOLMOwnSingleNamespacefeature gateCustomNoUpgradepreserved for oadp-1.4 4.18Migrated 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) — EOLOpen question:
build_argspipeline image resolutionci-operator's
build_argspasses literal strings as Docker--build-arg. TheDockerfile.catalogrunsopm render ${BUNDLE_IMG}which needs to pull the bundle image from a registry. Whether ci-operator resolves thebuild_argsvalueoadp-operator-bundleto the full pipeline imagestream pullspec at build time needs CI testing.If it doesn't resolve automatically, alternatives:
podman build --build-arg BUNDLE_IMG=$(oc get istag ...)Dockerfile.catalogto useCOPY --from=<bundle>instead ofopm renderDependencies
build/Dockerfile.catalogWhy FBC catalog image over operator-sdk:
opmis actively maintained by OLM team;operator-sdk run bundleis a convenience wrapper being deprecatedcli-operator-sdkbase image neededoptional-operators-ci-awsworkflow (CatalogSource + Subscription)Note
Responses generated with Claude
OADP Operator CI Migration to File-Based Catalog (FBC) Images
This PR migrates the OADP (OpenShift API for Data Protection) operator's OpenShift CI infrastructure from an operator-sdk based approach to a File-Based Catalog (FBC) image build process, eliminating the operator-sdk dependency and enabling Tech Preview features for newer OCP versions.
Configuration Updates
The changes affect 13 OADP operator CI configuration files across multiple release branches and OCP versions:
Modified configurations:
oadp-1.3: Updated for OCP 4.12, 4.13, 4.14, 4.15oadp-1.4: Updated for OCP 4.18oadp-1.5: Updated for OCP 4.19, 4.20oadp-1.6: Updated for OCP 4.18, 4.22, and 5.0oadp-dev: Updated for OCP 4.22, 4.23, and 5.0Deleted EOL configurations:
oadp-1.0__4.12.yamlandoadp-1.0__4.14.yaml(end-of-life branch)Technical Changes
All updated configuration files implement consistent changes:
Catalog Image Build: Introduces a new
oadp-operator-catalogimage built frombuild/Dockerfile.catalogwith aBUNDLE_IMGbuild argument pointing to the operator bundle image.Operator Bundle Updates: Operator bundle definitions now explicitly name the bundle (
as: oadp-operator-bundle) and disable index building (skip_building_index: true), shifting index responsibility to the dedicated catalog image.Test Infrastructure: AWS e2e test job configurations update their operator index reference from
ci-indextooadp-operator-catalog, integrating the new FBC-based catalog image into the test pipeline.Tech Preview Enablement: For OCP 4.22+ configurations (
oadp-1.6__4.22,oadp-1.6__5.0, and alloadp-devvariants), a newFEATURE_SET: TechPreviewNoUpgradeenvironment variable is added to enable OLMv1 OwnNamespace and VolumeGroupSnapshot testing capabilities.Dependency
This migration depends on openshift/oadp-operator#2204, which provides the
build/Dockerfile.catalogused to build the FBC images.