Skip to content

e2e: Install the released chart in the upgrade test (backport #277) - #287

Closed
mergify[bot] wants to merge 1 commit into
release-0.2from
mergify/bp/release-0.2/pr-277
Closed

mergify[bot] wants to merge 1 commit into
release-0.2from
mergify/bp/release-0.2/pr-277

Conversation

@mergify

@mergify mergify Bot commented Nov 3, 2026

Copy link
Copy Markdown

Since the move to Helm, TestOperatorUpgrade installed the released operator image with the chart from the current checkout. That only works while the current chart stays compatible with the released binary: a chart that passes a new controller flag or narrows the RBAC makes the released controller crash or fail to sync, and the test never gets to the upgrade.

Install the released version from its published chart instead, the way users upgrading from it have it deployed, then upgrade to the local chart as before. The chart comes from RELEASED_OPERATOR_CHART, so downstream builds can point elsewhere, and its version is RELEASED_OPERATOR_TAG without the leading "v", matching how the release workflow publishes it.

The released image is now the one the chart deploys, so RELEASED_OPERATOR_IMG is gone. On bink, push-released-operator-image reads that image from the chart and still copies it to the local registry, which keeps the test fast and avoids pulls from a remote registry timing out; the test overrides the chart image with that copy.

The restore cleanup is now registered right after the uninstall: when the released operator failed to come up, the cleanup was never registered and every later test ran without an operator.


This is an automatic backport of pull request #277 done by Mergify.

Since the move to Helm, TestOperatorUpgrade installed the released
operator image with the chart from the current checkout. That only works
while the current chart stays compatible with the released binary: a
chart that passes a new controller flag or narrows the RBAC makes the
released controller crash or fail to sync, and the test never gets to
the upgrade.

Install the released version from its published chart instead, the way
users upgrading from it have it deployed, then upgrade to the local
chart as before. The chart comes from RELEASED_OPERATOR_CHART, so
downstream builds can point elsewhere, and its version is
RELEASED_OPERATOR_TAG without the leading "v", matching how the release
workflow publishes it.

The released image is now the one the chart deploys, so
RELEASED_OPERATOR_IMG is gone. On bink, push-released-operator-image
reads that image from the chart and still copies it to the local
registry, which keeps the test fast and avoids pulls from a remote
registry timing out; the test overrides the chart image with that copy.

The restore cleanup is now registered right after the uninstall: when
the released operator failed to come up, the cleanup was never
registered and every later test ran without an operator.

Assisted-by: AI
Signed-off-by: Alice Frosi <afrosi@redhat.com>
(cherry picked from commit 490d903)

# Conflicts:
#	Makefile
@mergify mergify Bot added the conflicts label Nov 3, 2026
@mergify

mergify Bot commented Nov 3, 2026

Copy link
Copy Markdown
Author

Cherry-pick of 490d903 has failed:

On branch mergify/bp/release-0.2/pr-277
Your branch is up to date with 'origin/release-0.2'.

You are currently cherry-picking commit 490d903.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   test/e2e/upgrade_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Makefile

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

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.

1 participant