Skip to content

Conversation

maschmid
Copy link
Contributor

@maschmid maschmid commented Aug 1, 2025

  • 🧹 Update to 1.35.2

Also,

  1. Fixing the replaces and skipRange versions

AFAIU, the correct versions for replaces and skipRange are,

for a patch release

replaces: x.y.(z-1)
skipRange: >=x.y.0 <x.y.z

for a .0 release

replaces: x.(y-1).0
skipRange: >=x.(y-1).0 <x.y.0

(the previous version of the script didn't properly generate the replaces and skipRanges for z>1)

  1. Fixing the "default channel"

For older releases, we don't want to release into the "stable" channel, just to the "stable-x.y" channel, but the operator "default channel" (the operators.operatorframework.io.bundle.channel.default.v1 annotation) needs to be kept "stable".

(this patch introduces a new olm.channels.operator_default to make this be set separately, so the "default" channel to use for testing can be set to the "stable-x.y", while keeping the bundle annotation stay "stable".)

  1. Use the actually released bundles for the catalog and index image use in CI

We don't have a mechanism in CI nor in Konflux to store working bundles for previous patch releases. The only way we can properly build an index with .0,.1,.2,... bundles is to use actually released bundles from registry.redhat.io.

This patch changes how the olm-catalog/serverless-operator-index/Dockerfile is generated. Instead of adding the "old" CI bundles in build-time via "opm redner" as before, we do run "opm render" in "make generate-catalog", ( which is the only time we have credentials to pull images from registry.redhat.io )

This patch also fixes the "previous" operator versions for patch releases greater than .1 (e.g. for "1.35.3", the previous bundles would be "1.35.2", "1.35.1", "1.35.0", "1.34.0", "1.33.0", ... )

  1. Fix kitchensink-upgrade test to actually use the test catalog

Probably for the above reasons of not actually properly generating previous versions, the upgrade tests used a hack to use redhat-operators if the actual bundle was not in the test catalog. This is now fixed.

This patch also fixes the expected upgrade patch. Given the skipRanges, the path from 1.35.0 goes directly to 1.35.2 , so this patch skips the >1.35.0 <1.35.x versions in the kitchensink-upgrade csvs.

  1. There are some other minor hacks added for the kitchensink test, due to some resources not available in previous releases. (we could drop those if we scale back the upgrade path to just .e.g 1.35.0 -> 1.35.2 )

@openshift-ci openshift-ci bot requested review from dsimansk and matzew August 1, 2025 12:00
@openshift-ci openshift-ci bot added the approved label Aug 1, 2025
@maschmid
Copy link
Contributor Author

maschmid commented Aug 1, 2025

The catalogs are wrong, they're missing 1.35.1 for some reason.

@maschmid
Copy link
Contributor Author

maschmid commented Aug 1, 2025

/hold

@maschmid maschmid force-pushed the maschmid-release-1.35-update-to-1.35.2 branch from f1ec878 to 369925f Compare August 1, 2025 15:19
@maschmid
Copy link
Contributor Author

maschmid commented Aug 1, 2025

we need to push at least one 1.35.2 build to CI before we build the catalog with 1.32.2 in it, so dropping the catalog changes for now

@maschmid
Copy link
Contributor Author

maschmid commented Aug 1, 2025

/unhold

@maschmid
Copy link
Contributor Author

maschmid commented Aug 1, 2025

/hold
still doesn't look right. We're still missing 1.35.1 in olm-catalog/serverless-operator-index/configs/index.yaml and we need at least a CI build of 1.35.1 in olm-catalog/serverless-operator-index/Dockerfile

@maschmid
Copy link
Contributor Author

/retest-required

@maschmid
Copy link
Contributor Author

/test 419-operator-e2e

@maschmid
Copy link
Contributor Author

/test 419-images

1 similar comment
@maschmid
Copy link
Contributor Author

/test 419-images

@maschmid
Copy link
Contributor Author

/retest-required

@maschmid
Copy link
Contributor Author

/retest

@maschmid
Copy link
Contributor Author

/test 419-test-upgrade
/test 419-kitchensink-upgrade

@maschmid
Copy link
Contributor Author

/retest-required

@maschmid
Copy link
Contributor Author

/test 419-kitchensink-upgrade

@maschmid
Copy link
Contributor Author

/test 419-operator-e2e

@maschmid
Copy link
Contributor Author

/test 419-upstream-e2e
/test 419-kitchensink-e2e

@maschmid
Copy link
Contributor Author

/test 419-operator-e2e

@maschmid
Copy link
Contributor Author

/test 419-upstream-e2e-kafka
/test 419-mesh-upgrade

Copy link
Contributor

openshift-ci bot commented Aug 20, 2025

@maschmid: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/419-mesh-e2e 1746b4f link false /test 419-mesh-e2e
ci/prow/419-mesh-upgrade 1746b4f link false /test 419-mesh-upgrade

Full PR test history. Your PR dashboard.

Instructions 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.

@Kaustubh-pande
Copy link
Contributor

/lgtm

Copy link
Contributor

openshift-ci bot commented Aug 26, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Kaustubh-pande, maschmid

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

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [Kaustubh-pande,maschmid]

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

@maschmid
Copy link
Contributor Author

/unhold

@openshift-merge-bot openshift-merge-bot bot merged commit 1f3f1f1 into openshift-knative:release-1.35 Aug 26, 2025
25 of 27 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.

2 participants