Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: when delete DSCI CR get stuck because the current instance updated and not preperly remove finalizer on it #1142

Merged

Conversation

zdtsw
Copy link
Member

@zdtsw zdtsw commented Jul 26, 2024

Description

For investigation in https://issues.redhat.com/browse/RHOAIENG-10300 we can identify the problem is from an updated DSCI before removing finalizer.
To unblock this problem in regression, this is just a workaround.
and we need a proper work as suggested in https://issues.redhat.com/browse/RHOAIENG-10300

Current change:

  • after remove servicemesh and update condition, instance has been updated
  • use retryonconflict to make sure it is removed when something else might also update DSCI at the same time

https://issues.redhat.com/browse/RHOAIENG-9606

How Has This Been Tested?

local build: quay.io/wenzhou/opendatahub-operator-catalog:v2.15.1-9096
test step:

  • remove ossm from cluster
  • create dsci and dsc cr
  • wait tiil "missing ossm" error in both
  • delete dsc cr
  • delete dsci cr
  • done

also verified in QE cluster

Screenshot or short clip

Merge criteria

  • You have read the contributors guide.
  • Commit messages are meaningful - have a clear and concise summary and detailed explanation of what was changed and why.
  • Pull Request contains a description of the solution, a link to the JIRA issue, and to any dependent or related Pull Request.
  • Testing instructions have been added in the PR body (for PRs involving changes that are not immediately obvious).
  • The developer has manually tested the changes and verified that the changes work

- after remove servicemesh and update condition, instance has been
updated
- use retryonconflict to make sure it is removed when something else
might also update DSCI at the same time

Signed-off-by: Wen Zhou <[email protected]>
Copy link

openshift-ci bot commented Jul 26, 2024

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@zdtsw zdtsw marked this pull request as ready for review July 26, 2024 13:14
@openshift-ci openshift-ci bot requested review from CFSNM and Sara4994 July 26, 2024 13:14
@zdtsw zdtsw requested review from lburgazzoli and VaishnaviHire and removed request for Sara4994 July 26, 2024 13:14
@zdtsw zdtsw changed the title fix: when delete DSCI CR get current instance and remove finalizer on it fix: when delete DSCI CR get stuck because the current instance updated and not preperly remove finalizer on it Jul 26, 2024
Copy link

openshift-ci bot commented Jul 26, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CFSNM, lburgazzoli

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:

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

@CFSNM
Copy link
Contributor

CFSNM commented Jul 26, 2024

/retest

@openshift-merge-bot openshift-merge-bot bot merged commit fb6a37f into opendatahub-io:incubation Jul 26, 2024
8 checks passed
zdtsw added a commit to zdtsw-forking/rhods-operator that referenced this pull request Jul 29, 2024
… it (opendatahub-io#1142)

- after remove servicemesh and update condition, instance has been
updated
- use retryonconflict to make sure it is removed when something else
might also update DSCI at the same time

Signed-off-by: Wen Zhou <[email protected]>
openshift-merge-bot bot pushed a commit to red-hat-data-services/rhods-operator that referenced this pull request Jul 29, 2024
… it (opendatahub-io#1142)

- after remove servicemesh and update condition, instance has been
updated
- use retryonconflict to make sure it is removed when something else
might also update DSCI at the same time

Signed-off-by: Wen Zhou <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants