Skip to content

Add OLM upgrade support to Makefile#1873

Merged
openshift-merge-bot[bot] merged 2 commits into
openstack-k8s-operators:mainfrom
stuggi:olm_update
Apr 15, 2026
Merged

Add OLM upgrade support to Makefile#1873
openshift-merge-bot[bot] merged 2 commits into
openstack-k8s-operators:mainfrom
stuggi:olm_update

Conversation

@stuggi

@stuggi stuggi commented Apr 7, 2026

Copy link
Copy Markdown
Contributor

Add REPLACES variable to inject replaces field into the CSV for OLM upgrade paths. Add PREV_BUNDLE_IMG and CATALOG_BUNDLE_IMGS variables to support incremental and from-scratch catalog builds with full upgrade chains. Fix kustomization.yaml patch accumulation by clearing old patches before regenerating.

@github-actions

github-actions Bot commented Apr 7, 2026

Copy link
Copy Markdown

OpenStackControlPlane CRD Size Report

Metric Value
CRD JSON size 322326 bytes (315KB)
Base branch size 322326 bytes
Change +0.00%
Status yellow — growing
Threshold reference
Color Range Meaning
🟢 green < 300KB Comfortable
🟡 yellow 300–400KB Growing
🟠 orange 400–750KB Concerning
🔴 red > 750KB Approaching 1.5MB etcd limit (cut in half to allow space for update)

@stuggi stuggi requested review from dprince and removed request for slagle April 7, 2026 13:57
@stuggi

stuggi commented Apr 7, 2026

Copy link
Copy Markdown
Contributor Author

@softwarefactory-project-zuul

Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/53da56d6dc35488c92d59bbb83fcae8f

✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 21m 55s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 24m 50s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 29m 55s
openstack-operator-tempest-multinode RETRY_LIMIT in 16m 13s
openstack-operator-edpm-baremetal-minor-update FAILURE in 2h 08m 54s

@stuggi

stuggi commented Apr 8, 2026

Copy link
Copy Markdown
Contributor Author

/retest

must-gather failed

@lmiccini

lmiccini commented Apr 9, 2026

Copy link
Copy Markdown
Contributor

/test openstack-operator-build-deploy-kuttl-4-18

@jistr jistr self-requested a review April 9, 2026 12:08
Comment thread Makefile

@abays abays left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci

openshift-ci Bot commented Apr 13, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abays, stuggi

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@stuggi

stuggi commented Apr 13, 2026

Copy link
Copy Markdown
Contributor Author

/hold need to validate once more. I have an issue using my latest custom build. not sure if it is related to this

@openshift-ci

openshift-ci Bot commented Apr 14, 2026

Copy link
Copy Markdown
Contributor

New changes are detected. LGTM label has been removed.

@stuggi

stuggi commented Apr 14, 2026

Copy link
Copy Markdown
Contributor Author

/retest

@stuggi

stuggi commented Apr 14, 2026

Copy link
Copy Markdown
Contributor Author

/retest just failed on must-gather

@stuggi

stuggi commented Apr 14, 2026

Copy link
Copy Markdown
Contributor Author

/retest

@stuggi

stuggi commented Apr 14, 2026

Copy link
Copy Markdown
Contributor Author

/retest

1 similar comment
@stuggi

stuggi commented Apr 15, 2026

Copy link
Copy Markdown
Contributor Author

/retest

@ciecierski ciecierski requested a review from sathlan April 15, 2026 09:24
@ciecierski

Copy link
Copy Markdown
Contributor

@sathlan Just fyi that there is being added mechanism for OLM update testing

stuggi and others added 2 commits April 15, 2026 18:09
Add REPLACES variable to inject `replaces` field into the CSV for OLM
upgrade paths. Add PREV_BUNDLE_IMG and CATALOG_BUNDLE_IMGS variables to
support incremental and from-scratch catalog builds with full upgrade
chains. Fix kustomization.yaml patch accumulation by clearing old patches
before regenerating.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: Martin Schuppert <mschuppert@redhat.com>
Revert IMAGENAMESPACE behavior to pre-507cdb80 logic where it only
affects replaced operators (non-openstack-k8s-operators) and operators
matching IMAGEBASE. Standard openstack-k8s-operators bundles now always
use quay.io/openstack-k8s-operators regardless of IMAGENAMESPACE.

This fixes the issue where setting IMAGENAMESPACE to a custom value
would try to find all bundles (barbican, cinder, etc.) in the custom
namespace instead of quay.io/openstack-k8s-operators, causing failures
when those bundles don't exist there.

The previous behavior is restored:
- IMAGENAMESPACE only affects replaced operators (e.g., custom forks)
- IMAGEBASE explicitly targets a specific operator for custom namespace
- Standard operators always use openstack-k8s-operators namespace

All bug fixes from 507cdb8 are retained (better error handling, jq
safety checks, proper query string syntax).

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
Signed-off-by: Martin Schuppert <mschuppert@redhat.com>
@jistr

jistr commented Apr 15, 2026

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-merge-bot openshift-merge-bot Bot merged commit b8d882a into openstack-k8s-operators:main Apr 15, 2026
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants