Avoid removing user labels #2743
Conversation
kubevirt-bot
added
do-not-merge/work-in-progress
Pull Request Test Coverage Report for Build 7893376626Details
💛 - Coveralls |
|
hco-e2e-kv-smoke-gcp lane succeeded. |
|
@hco-bot: Overrode contexts on behalf of hco-bot: ci/prow/hco-e2e-kv-smoke-azure In response to this:
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. |
tiraboschi
force-pushed
the
extra_labels
branch
2 times, most recently
from
6e73456
to
fddf26b
Compare
|
hco-e2e-kv-smoke-gcp lane succeeded. |
|
@hco-bot: Overrode contexts on behalf of hco-bot: ci/prow/hco-e2e-kv-smoke-azure In response to this:
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. |
tiraboschi
force-pushed
the
extra_labels
branch
from
fddf26b
to
9092a7a
Compare
|
hco-e2e-kv-smoke-gcp lane succeeded. |
|
@hco-bot: Overrode contexts on behalf of hco-bot: ci/prow/hco-e2e-kv-smoke-azure In response to this:
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. |
tiraboschi
force-pushed
the
extra_labels
branch
2 times, most recently
from
884e70e
to
b76d753
Compare
|
hco-e2e-kv-smoke-gcp lane succeeded. |
|
@hco-bot: Overrode contexts on behalf of hco-bot: ci/prow/hco-e2e-kv-smoke-azure In response to this:
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. |
tiraboschi
force-pushed
the
extra_labels
branch
2 times, most recently
from
13b9180
to
1692ec2
Compare
|
hco-e2e-operator-sdk-aws lane succeeded. |
|
@hco-bot: Overrode contexts on behalf of hco-bot: ci/prow/hco-e2e-operator-sdk-gcp, ci/prow/okd-hco-e2e-operator-sdk-gcp, ci/prow/okd-hco-e2e-upgrade-operator-sdk-gcp In response to this:
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. |
|
hco-e2e-consecutive-operator-sdk-upgrades-aws lane succeeded. |
|
@hco-bot: Overrode contexts on behalf of hco-bot: ci/prow/hco-e2e-consecutive-operator-sdk-upgrades-azure, ci/prow/hco-e2e-upgrade-prev-operator-sdk-azure In response to this:
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. |
kubevirt-bot
added
the
needs-rebase
tiraboschi
force-pushed
the
extra_labels
branch
from
1692ec2
to
c23d553
Compare
|
@hco-bot: Overrode contexts on behalf of hco-bot: ci/prow/hco-e2e-consecutive-operator-sdk-upgrades-azure In response to this:
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. |
pkg/util/labels.go
Outdated
| if src.GetLabels() == nil { | ||
| return true | ||
| } |
There was a problem hiding this comment.
nit - this is not needed. if the label map is empty/nil, the for loop will exit and the function will return true.
| if src.Labels == nil { | ||
| return | ||
| } | ||
|
|
||
| tgt.Labels = make(map[string]string, len(src.Labels)) | ||
| if tgt.Labels == nil { | ||
| tgt.Labels = make(map[string]string, len(src.Labels)) |
There was a problem hiding this comment.
nit - we can drop the 2nd parameter (the map length). It's not save anything, AFAIK.
| return is.GetLabels() | ||
| }).WithTimeout(time.Second * 15).WithPolling(time.Millisecond * 100).ShouldNot(HaveKey("test-label")) | ||
| return is.GetLabels()["app.kubernetes.io/part-of"] | ||
| }).WithTimeout(time.Second * 15).WithPolling(time.Millisecond * 100).ShouldNot(Equal("wrong-value")) |
There was a problem hiding this comment.
Can we check that we get the requested value, instead of not receiving the wrong one?
tiraboschi
force-pushed
the
extra_labels
branch
from
594539f
to
2047039
Compare
Reconcile managed labels on operands without removing user added ones. Add unit and func tests. Signed-off-by: Simone Tiraboschi <stirabos@redhat.com>
tiraboschi
force-pushed
the
extra_labels
branch
from
2047039
to
34b83be
Compare
|
|
hco-e2e-consecutive-operator-sdk-upgrades-aws lane succeeded. |
|
@hco-bot: Overrode contexts on behalf of hco-bot: ci/prow/hco-e2e-consecutive-operator-sdk-upgrades-azure, ci/prow/hco-e2e-upgrade-prev-operator-sdk-sno-azure, ci/prow/okd-hco-e2e-upgrade-operator-sdk-gcp In response to this:
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. |
|
okd-hco-e2e-operator-sdk-gcp lane succeeded. |
|
@hco-bot: Overrode contexts on behalf of hco-bot: ci/prow/okd-hco-e2e-operator-sdk-aws In response to this:
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. |
|
@tiraboschi: The following tests failed, say
Full PR test history. Your PR dashboard. 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. I understand the commands that are listed here. |
|
hco-e2e-operator-sdk-gcp, hco-e2e-operator-sdk-aws lanes succeeded. |
|
@hco-bot: Overrode contexts on behalf of hco-bot: ci/prow/hco-e2e-operator-sdk-azure, ci/prow/hco-e2e-operator-sdk-sno-azure, ci/prow/hco-e2e-upgrade-operator-sdk-aws, ci/prow/hco-e2e-upgrade-prev-operator-sdk-azure In response to this:
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. |
|
hco-e2e-kv-smoke-gcp lane succeeded. |
|
@hco-bot: Overrode contexts on behalf of hco-bot: ci/prow/hco-e2e-kv-smoke-azure In response to this:
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. |
|
/retest |
|
hco-e2e-upgrade-operator-sdk-sno-aws lane succeeded. |
|
@hco-bot: Overrode contexts on behalf of hco-bot: ci/prow/hco-e2e-upgrade-operator-sdk-sno-azure In response to this:
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. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: nunnatsa 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 |
kubevirt-bot
added
the
approved
|
/cherry-pick release-1.11 |
|
@tiraboschi: #2743 failed to apply on top of branch "release-1.11": In response to this:
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. |
Reconcile managed labels on operands without removing user added ones. Add unit and func tests. This is a manual cherry-pick of kubevirt#2743 Signed-off-by: Simone Tiraboschi <stirabos@redhat.com>
* [release-1.11] Avoid removing user labels (#2743) Reconcile managed labels on operands without removing user added ones. Add unit and func tests. This is a manual cherry-pick of #2743 Signed-off-by: Simone Tiraboschi <stirabos@redhat.com> * Fix additional cases in labels handling (#2820) Fix additional cases in labels handling on operands, add more unit tests. Signed-off-by: Simone Tiraboschi <stirabos@redhat.com> --------- Signed-off-by: Simone Tiraboschi <stirabos@redhat.com>
What this PR does / why we need it:
Reconcile managed labels on operands without
removing user added ones.
Add unit and func tests.
Reviewer Checklist
Jira Ticket:
Release note: