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

Get rid of DataImportCron finalizer #2144

Merged
merged 4 commits into from Feb 12, 2022

Conversation

arnongilboa
Copy link
Collaborator

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

What this PR does / why we need it:
Simplify the deletion of CDI and detaching it from cdi-deployment, so we won't need the DataImportCron controller to stay there to remove DataImportCrons finalizer so they can be deleted.

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. size/L labels Feb 7, 2022
@brybacki
Copy link
Member

brybacki commented Feb 8, 2022

All tests failed! Is it a code problem or something in environment?
@arnongilboa can you check it?

@arnongilboa
Copy link
Collaborator Author

All tests failed! Is it a code problem or something in environment? @arnongilboa can you check it?

@brybacki my fault

@arnongilboa
Copy link
Collaborator Author

/retest

1 similar comment
@arnongilboa
Copy link
Collaborator Author

/retest

Signed-off-by: Arnon Gilboa <agilboa@redhat.com>
Signed-off-by: Arnon Gilboa <agilboa@redhat.com>
Signed-off-by: Arnon Gilboa <agilboa@redhat.com>
@arnongilboa
Copy link
Collaborator Author

/retest

Signed-off-by: Arnon Gilboa <agilboa@redhat.com>
@awels
Copy link
Member

awels commented Feb 10, 2022

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

@awels
Copy link
Member

awels commented Feb 10, 2022

/test pull-containerized-data-importer-e2e-k8s-1.21-ceph

@arnongilboa
Copy link
Collaborator Author

/retest

@arnongilboa
Copy link
Collaborator Author

/cherrypick release-v1.43

@kubevirt-bot
Copy link
Contributor

@arnongilboa: once the present PR merges, I will cherry-pick it on top of release-v1.43 in a new PR and assign it to you.

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.

@mhenriks
Copy link
Member

/lgtm
/approve

@kubevirt-bot kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label Feb 11, 2022
@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 Feb 11, 2022
@awels
Copy link
Member

awels commented Feb 11, 2022

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

@awels
Copy link
Member

awels commented Feb 11, 2022

/override pull-containerized-data-importer-e2e-k8s-1.22-upg

@kubevirt-bot
Copy link
Contributor

@awels: Overrode contexts on behalf of awels: pull-containerized-data-importer-e2e-k8s-1.22-upg

In response to this:

/override pull-containerized-data-importer-e2e-k8s-1.22-upg

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.

@awels
Copy link
Member

awels commented Feb 11, 2022

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

@awels
Copy link
Member

awels commented Feb 11, 2022

/test pull-containerized-data-importer-e2e-k8s-1.22-nfs

@awels
Copy link
Member

awels commented Feb 11, 2022

/override pull-containerized-data-importer-e2e-k8s-1.21-ceph

@kubevirt-bot
Copy link
Contributor

@awels: Overrode contexts on behalf of awels: pull-containerized-data-importer-e2e-k8s-1.21-ceph

In response to this:

/override pull-containerized-data-importer-e2e-k8s-1.21-ceph

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.

@awels
Copy link
Member

awels commented Feb 12, 2022

/retest

@kubevirt-bot kubevirt-bot merged commit 0ee4a61 into kubevirt:main Feb 12, 2022
@kubevirt-bot
Copy link
Contributor

@arnongilboa: #2144 failed to apply on top of branch "release-v1.43":

Applying: Get rid of DataImportCron finalizer
Using index info to reconstruct a base tree...
M	pkg/controller/dataimportcron-controller.go
M	pkg/controller/dataimportcron-controller_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/controller/dataimportcron-controller_test.go
Auto-merging pkg/controller/dataimportcron-controller.go
CONFLICT (content): Merge conflict in pkg/controller/dataimportcron-controller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Get rid of DataImportCron finalizer
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

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
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
Development

Successfully merging this pull request may close these issues.

None yet

5 participants