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

Jump to bottom

Fix CRDs deletion in operator deletion #2129

Merged
merged 2 commits into from Jan 28, 2022
Merged

Fix CRDs deletion in operator deletion #2129

merged 2 commits into from Jan 28, 2022

Conversation

arnongilboa
Copy link
Collaborator

Also check DataImportCron CRD has no DeletionTimestamp before adding a
finalizer

Signed-off-by: Arnon Gilboa agilboa@redhat.com

What this PR does / why we need it:

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

Release note:

NONE

@kubevirt-bot kubevirt-bot added release-note-none Denotes a PR that doesn't merit a release note. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Jan 26, 2022
@arnongilboa
Fix CRDs deletion in operator deletion
f2a0d50 
Also check DataImportCron CRD has no DeletionTimestamp before adding a
finalizer

Signed-off-by: Arnon Gilboa <agilboa@redhat.com>
mhenriks
mhenriks reviewed Jan 27, 2022
View reviewed changes
pkg/operator/controller/controller_test.go Outdated
Eventually(func() bool {
result, err := args.reconciler.Reconcile(context.TODO(), reconcileRequest(args.cdi.Name))
return err == nil && !result.Requeue
}, 1*time.Minute, 2*time.Second).Should(BeTrue())
Copy link
Member

Choose a reason for hiding this comment

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

What's going on here? Unit tests should be deterministic.

Copy link
Member

Choose a reason for hiding this comment

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

I think I get it

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Thanks. Reverted it.

mhenriks
mhenriks reviewed Jan 27, 2022
View reviewed changes
pkg/operator/controller/callbacks.go Outdated
}
crdsExist := false
for _, crdName := range crdNames {
crd := &extv1.CustomResourceDefinition{ObjectMeta: metav1.ObjectMeta{Name: crdName}}
Copy link
Member

Choose a reason for hiding this comment

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

Maybe changing this to the following to address unit test issues?

Get CRD if not exist continue
If CRD.deletionTimestamp == nil{
Delete CRD
Get CRD if not exist continue
}
crdsExist = true

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

So the issue was caused by repeated Delete() of CRD which already had DeletionTimestamp? Late night games...
Fixed

@arnongilboa
Copy link
Collaborator Author

/retest

mhenriks
mhenriks reviewed Jan 27, 2022
View reviewed changes
pkg/operator/controller/callbacks.go
}
args.Logger.Info("CRD is not deleted yet", "crdName", crdName)
crdsExist = true
}
Copy link
Member

Choose a reason for hiding this comment

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

you have to set crdsExist = true here is else block when crd.DeletionTimestamp != nil

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Fat fingers. Fixed.

mhenriks
mhenriks reviewed Jan 27, 2022
View reviewed changes
pkg/controller/dataimportcron-controller.go Outdated
log := r.log.WithName("initCron")
if !HasFinalizer(dataImportCron, dataImportCronFinalizer) {
crd := &extv1.CustomResourceDefinition{}
if err := r.client.Get(context.TODO(), types.NamespacedName{Name: "dataimportcrons.cdi.kubevirt.io"}, crd); err == nil {
Copy link
Member

Choose a reason for hiding this comment

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

err == nil
Don’t think that’s correct

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

fixed

mhenriks
mhenriks reviewed Jan 27, 2022
View reviewed changes
pkg/controller/dataimportcron-controller.go Outdated
crd := &extv1.CustomResourceDefinition{}
if err := r.client.Get(context.TODO(), types.NamespacedName{Name: "dataimportcrons.cdi.kubevirt.io"}, crd); err == nil {
log.Error(err, "Cannot get CRD")
return nil
Copy link
Member

Choose a reason for hiding this comment

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

Return err?

mhenriks
mhenriks reviewed Jan 27, 2022
View reviewed changes
pkg/controller/dataimportcron-controller.go Outdated
}
if crd.DeletionTimestamp != nil {
log.Info("CRD has DeletionTimestamp")
return nil
Copy link
Member

Choose a reason for hiding this comment

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

Return an error instead maybe?

@arnongilboa
Copy link
Collaborator Author

/retest

@mhenriks
Copy link
Member

/lgtm
/approve

@kubevirt-bot kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label Jan 27, 2022
@mhenriks
Copy link
Member

/retest

@kubevirt-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mhenriks

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

@kubevirt-bot kubevirt-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 27, 2022
@mhenriks
Copy link
Member

/hold

@kubevirt-bot kubevirt-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 27, 2022
@mhenriks
Copy link
Member

new func test may be flaky

@arnongilboa
CR fixes
6f0774d 
Signed-off-by: Arnon Gilboa <agilboa@redhat.com>
@kubevirt-bot kubevirt-bot removed the lgtm Indicates that a PR is ready to be merged. label Jan 27, 2022
@arnongilboa
Copy link
Collaborator Author

/retest

@arnongilboa
Copy link
Collaborator Author

new func test may be flaky

@mhenriks it was not the new func test, but a missing extv1.AddToScheme() in the controller for the CRD. Added.

@mhenriks
Copy link
Member

/hold cancel

@kubevirt-bot kubevirt-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 28, 2022
@mhenriks
Copy link
Member

/test pull-containerized-data-importer-e2e-k8s-1.22-hpp-destructive

@mhenriks
Copy link
Member

/lgtm

@kubevirt-bot kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label Jan 28, 2022
@kubevirt-bot kubevirt-bot merged commit 472c38e into kubevirt:main Jan 28, 2022
@arnongilboa
Copy link
Collaborator Author

/cherrypick release-v1.43

@kubevirt-bot kubevirt-bot mentioned this pull request Jan 28, 2022
Merged
@kubevirt-bot
Copy link
Contributor

@arnongilboa: new pull request created: #2130

In response to this:

/cherrypick release-v1.43

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/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mhenriks mhenriks mhenriks left review comments

@aglitke aglitke Awaiting requested review from aglitke

Assignees

@mhenriks mhenriks

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. lgtm Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/L
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@arnongilboa @mhenriks @kubevirt-bot