[multiple] Fix InstallPlan approval during update #3662
Conversation
|
Skipping CI for Draft Pull Request. |
|
/test all |
|
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/a7edbf2f705745cf8dc492d5eba74308 ✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 15m 02s |
|
recheck |
|
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/803278bc5e1b4d36b99e58d569f47567 ✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 00m 57s |
|
recheck |
|
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/453ee9dfa374468692b50a841e6b92aa ✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 16m 50s |
The version filtering introduced in b1d8f70 correctly ensures the initial deploy only approves the InstallPlan matching the pinned deployment_version. However, the update role also calls install_plan.yml with the same deployment_version still set, causing it to filter for the already-approved old version's plan instead of the newer version's unapproved plan. This results in a timeout after 30 retries. Fix by introducing cifmw_kustomize_deploy_installplan_target_version as an override variable. install_plan.yml checks this first, falling back to cifmw_ci_gen_kustomize_values_deployment_version when unset. The update role passes '' to disable version filtering, allowing it to approve whichever unapproved InstallPlan OLM has created for the next available version. Behavior summary: - Initial deploy (target_version unset): filters by deployment_version - Update (target_version=''): approves first unapproved plan Signed-off-by: Roberto Alfieri <ralfieri@redhat.com>
rebtoor
force-pushed
the
update-install-plan
branch
from
26308ac to
6a1e1bf
Compare
| # Description: | ||
| # Set of tasks to accept the latest Manual installPlan provided by OLM. | ||
| # | ||
| # Version filtering behavior: |
There was a problem hiding this comment.
do we need such comment?
|
/approved |
|
[APPROVALNOTIFIER] This PR is APPROVED Approval requirements bypassed by manually added approval. This pull-request has been approved by: 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-merge-bot
bot
merged commit b4bda4f
into
openstack-k8s-operators:main
4 participants
The version filtering introduced in b1d8f70 correctly ensures the initial deploy only approves the InstallPlan matching the pinned deployment_version. However, the update role also calls install_plan.yml with the same deployment_version still set, causing it to filter for the already-approved old version's plan instead of the newer version's unapproved plan. This results in a timeout after 30 retries.
Fix by introducing
cifmw_kustomize_deploy_installplan_target_versionas an override variable. install_plan.yml checks this first, falling back tocifmw_ci_gen_kustomize_values_deployment_versionwhen unset. The update role passes''to disable version filtering, allowing it to approve whichever unapproved InstallPlan OLM has created for the next available version.Behavior summary:
''): approves first unapproved planAssisted-by: Cursor(claude-4.6-opus)