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

Change some relationship labels on update as well #2018

Merged
merged 4 commits into from
Nov 23, 2021

Conversation

akalenyu
Copy link
Collaborator

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 #
https://bugzilla.redhat.com/show_bug.cgi?id=2017478

Special notes for your reviewer:

Release note:

BugFix: Some of the cdi resources are missing labels after upgrade

@kubevirt-bot kubevirt-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Nov 14, 2021
@akalenyu akalenyu force-pushed the labels-upgrade-bug branch 2 times, most recently from 7136cbd to bd46397 Compare November 14, 2021 15:27
@akalenyu
Copy link
Collaborator Author

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

@akalenyu
Copy link
Collaborator Author

/retest

1 similar comment
@akalenyu
Copy link
Collaborator Author

/retest

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>
Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>
BZ#2017478

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>
@awels
Copy link
Member

awels commented Nov 22, 2021

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

@kubevirt-bot kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label Nov 22, 2021
@kubevirt-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: awels

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 Nov 22, 2021
@akalenyu
Copy link
Collaborator Author

/retest

@akalenyu
Copy link
Collaborator Author

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

@kubevirt-bot kubevirt-bot merged commit eb639a6 into kubevirt:main Nov 23, 2021
@akalenyu
Copy link
Collaborator Author

/cherrypick release-v1.38

@kubevirt-bot
Copy link
Contributor

@akalenyu: #2018 failed to apply on top of branch "release-v1.38":

Applying: Update operator-lifecycle-sdk to get fix for labels on upgrade
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update operator-lifecycle-sdk to get fix for labels on upgrade
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.38

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.

akalenyu added a commit to akalenyu/containerized-data-importer that referenced this pull request Nov 23, 2021
* Update operator-lifecycle-sdk to get fix for labels on upgrade

Update dep to get kubevirt/controller-lifecycle-operator-sdk#19

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>

* Reconcile labels also for CDIConfig

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>

* Reconcile labels on storageprofile

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>

* Reconcile remaining operator resources for updated labels

BZ#2017478

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>
akalenyu added a commit to akalenyu/containerized-data-importer that referenced this pull request Dec 14, 2021
* Update operator-lifecycle-sdk to get fix for labels on upgrade

Update dep to get kubevirt/controller-lifecycle-operator-sdk#19

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>

* Reconcile labels also for CDIConfig

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>

* Reconcile labels on storageprofile

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>

* Reconcile remaining operator resources for updated labels

BZ#2017478

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>
akalenyu added a commit to akalenyu/containerized-data-importer that referenced this pull request Dec 15, 2021
* Update operator-lifecycle-sdk to get fix for labels on upgrade

Update dep to get kubevirt/controller-lifecycle-operator-sdk#19

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>

* Reconcile labels also for CDIConfig

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>

* Reconcile labels on storageprofile

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>

* Reconcile remaining operator resources for updated labels

BZ#2017478

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>
kubevirt-bot pushed a commit that referenced this pull request Dec 16, 2021
* Update operator-lifecycle-sdk to get fix for labels on upgrade

Update dep to get kubevirt/controller-lifecycle-operator-sdk#19

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>

* Reconcile labels also for CDIConfig

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>

* Reconcile labels on storageprofile

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>

* Reconcile remaining operator resources for updated labels

BZ#2017478

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>
akalenyu added a commit to akalenyu/containerized-data-importer that referenced this pull request Jan 5, 2022
This one was missed in kubevirt#2018, we want to maintain its label values on update as well.

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>
kubevirt-bot pushed a commit that referenced this pull request Jan 10, 2022
This one was missed in #2018, we want to maintain its label values on update as well.

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>
kubevirt-bot pushed a commit to kubevirt-bot/containerized-data-importer that referenced this pull request Jan 10, 2022
This one was missed in kubevirt#2018, we want to maintain its label values on update as well.

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>
akalenyu added a commit to akalenyu/containerized-data-importer that referenced this pull request Jan 11, 2022
This one was missed in kubevirt#2018, we want to maintain its label values on update as well.

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>
kubevirt-bot added a commit that referenced this pull request Jan 18, 2022
This one was missed in #2018, we want to maintain its label values on update as well.

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>

Co-authored-by: Alex Kalenyuk <akalenyu@redhat.com>
kubevirt-bot pushed a commit that referenced this pull request Jan 24, 2022
This one was missed in #2018, we want to maintain its label values on update as well.

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>
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 Denotes a PR that will be considered when it comes time to generate release notes. size/L
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants