[release-4.9] Bug 2097736: Fix loadBalancerServiceAnnotationsChanged check and update #786

Miciah · 2022-06-16T21:30:04Z

This is a manual cherry-pick of #783. #707 introduced a conflict that required resolution.

`loadBalancerServiceAnnotationsChanged`: Fix update

Fix loadBalancerServiceAnnotationsChanged to use the provided annotations argument when updating annotations. Before this change, loadBalancerServiceAnnotationsChanged used the annotations argument when checking whether annotations had changed, but then it used managedLoadBalancerServiceAnnotations when setting the annotations in the updated service object.

When checking whether the service is upgradeable for the purpose of setting the ingresscontroller's "Upgradeable" status condition, loadBalancerServiceTagsModified calls loadBalancerServiceAnnotationsChanged with an annotations argument that includes the "service.beta.kubernetes.io/aws-load-balancer-additional-resource-tags" annotation key, which is not in managedLoadBalancerServiceAnnotations. As a result, loadBalancerServiceAnnotationsChanged would report that the service was not upgradeable, but then the status condition message would not show that the "aws-load-balancer-additional-resource-tags" annotation had changed.

pkg/operator/controller/ingress/load_balancer_service.go (loadBalancerServiceAnnotationsChanged): Use the provided annotations argument instead of using managedLoadBalancerServiceAnnotations when updating annotations.
pkg/operator/controller/ingress/load_balancer_service_test.go (TestLoadBalancerServiceAnnotationsChanged): New test. Verify that loadBalancerServiceAnnotationsChanged behaves correctly when an unmanaged annotation is updated or when a managed annotation is added, updated, or deleted.

`loadBalancerServiceAnnotationsChanged`: Fix check

Fix loadBalancerServiceAnnotationsChanged to treat nil and empty annotations maps as equal. Before this commit, the comparison erroneously flagged an empty map and a nil map as unequal. As a result, the ingress operator could erroneously report that an ingresscontroller with a service with no annotations was not upgradeable.

pkg/operator/controller/ingress/load_balancer_service.go (loadBalancerServiceAnnotationsChanged): Use a for loop instead of go-cmp to check whether any managed annotations have changed.
pkg/operator/controller/ingress/load_balancer_service_test.go (TestLoadBalancerServiceAnnotationsChanged): Add test cases for empty/nil current/expected annotations.

Fix loadBalancerServiceAnnotationsChanged to use the provided "annotations" argument when updating annotations. Before this commit, loadBalancerServiceAnnotationsChanged used the annotations argument when checking whether annotations had changed, but then it used managedLoadBalancerServiceAnnotations when setting the annotations in the updated service object. When checking whether the service is upgradeable for the purpose of setting the ingresscontroller's "Upgradeable" status condition, loadBalancerServiceTagsModified calls loadBalancerServiceAnnotationsChanged with an annotations argument that includes the "service.beta.kubernetes.io/aws-load-balancer-additional-resource-tags" annotation key, which is not in managedLoadBalancerServiceAnnotations. As a result, loadBalancerServiceAnnotationsChanged would report that the service was not upgradeable, but then the status condition message would not show that the "aws-load-balancer-additional-resource-tags" annotation had changed. * pkg/operator/controller/ingress/load_balancer_service.go (loadBalancerServiceAnnotationsChanged): Use the provided annotations argument instead of using managedLoadBalancerServiceAnnotations when updating annotations. * pkg/operator/controller/ingress/load_balancer_service_test.go (TestLoadBalancerServiceAnnotationsChanged): New test. Verify that loadBalancerServiceAnnotationsChanged behaves correctly when an unmanaged annotation is updated or when a managed annotation is added, updated, or deleted.

Fix loadBalancerServiceAnnotationsChanged to treat nil and empty annotations maps as equal. Before this commit, the comparison erroneously flagged an empty map and a nil map as unequal. As a result, the ingress operator could erroneously report that an ingresscontroller with a service with no annotations was not upgradeable. This commit fixes bug 2097555. https://bugzilla.redhat.com/show_bug.cgi?id=2097555 * pkg/operator/controller/ingress/load_balancer_service.go (loadBalancerServiceAnnotationsChanged): Use a for loop instead of go-cmp to check whether any managed annotations have changed. * pkg/operator/controller/ingress/load_balancer_service_test.go (TestLoadBalancerServiceAnnotationsChanged): Add test cases for empty/nil current/expected annotations.

openshift-ci · 2022-06-16T21:30:19Z

@Miciah: This pull request references Bugzilla bug 2097736, which is invalid:

expected dependent Bugzilla bug 2097735 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is ASSIGNED instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

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.

candita · 2022-06-16T22:47:32Z

/lgtm

openshift-ci · 2022-06-16T22:48:03Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: candita, Miciah

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:

~~OWNERS~~ [Miciah,candita]

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

openshift-bot · 2022-06-17T01:00:46Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci · 2022-06-17T01:00:51Z

@openshift-bot: This pull request references Bugzilla bug 2097736, which is invalid:

expected dependent Bugzilla bug 2097735 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is POST instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

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.

openshift-bot · 2022-06-18T01:01:06Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci · 2022-06-18T01:01:10Z

@openshift-bot: This pull request references Bugzilla bug 2097736, which is invalid:

expected dependent Bugzilla bug 2097735 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is POST instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

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.

openshift-bot · 2022-06-19T01:01:12Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci · 2022-06-19T01:01:19Z

@openshift-bot: This pull request references Bugzilla bug 2097736, which is invalid:

expected dependent Bugzilla bug 2097735 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is POST instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

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.

openshift-bot · 2022-06-20T01:01:13Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci · 2022-06-20T01:01:20Z

@openshift-bot: This pull request references Bugzilla bug 2097736, which is invalid:

expected dependent Bugzilla bug 2097735 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is POST instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

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.

openshift-bot · 2022-06-21T01:01:13Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci · 2022-06-21T01:01:20Z

@openshift-bot: This pull request references Bugzilla bug 2097736, which is invalid:

expected dependent Bugzilla bug 2097735 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is POST instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

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.

openshift-bot · 2022-06-22T01:00:41Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci · 2022-06-22T01:00:50Z

@openshift-bot: This pull request references Bugzilla bug 2097736, which is invalid:

expected dependent Bugzilla bug 2097735 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is POST instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

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.

openshift-bot · 2022-06-23T01:00:44Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci · 2022-06-23T01:01:05Z

@openshift-bot: This pull request references Bugzilla bug 2097736, which is invalid:

expected dependent Bugzilla bug 2097735 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is POST instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

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.

Miciah · 2022-06-23T21:04:36Z

/test e2e-aws-operator

openshift-ci · 2022-06-23T22:54:29Z

@Miciah: all tests passed!

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.

Miciah · 2022-06-23T23:31:27Z

/label backport-risk-assessed

openshift-bot · 2022-06-27T01:01:12Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci · 2022-06-27T01:01:18Z

@openshift-bot: This pull request references Bugzilla bug 2097736, which is invalid:

expected dependent Bugzilla bug 2097735 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is POST instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

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.

lihongan · 2022-06-27T02:07:45Z

/label cherry-pick-approved

openshift-bot · 2022-06-28T01:00:43Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci · 2022-06-28T01:00:59Z

@openshift-bot: This pull request references Bugzilla bug 2097736, which is invalid:

expected dependent Bugzilla bug 2097735 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is POST instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

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.

openshift-bot · 2022-06-29T01:01:22Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci · 2022-06-29T01:01:46Z

@openshift-bot: This pull request references Bugzilla bug 2097736, which is invalid:

expected dependent Bugzilla bug 2097735 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is POST instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

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.

openshift-bot · 2022-06-30T01:01:16Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci · 2022-06-30T01:01:54Z

@openshift-bot: This pull request references Bugzilla bug 2097736, which is invalid:

expected dependent Bugzilla bug 2097735 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is POST instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

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.

openshift-bot · 2022-07-01T01:01:12Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci · 2022-07-01T01:03:18Z

@openshift-bot: This pull request references Bugzilla bug 2097736, which is invalid:

expected dependent Bugzilla bug 2097735 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is POST instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

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.

openshift-bot · 2022-07-02T01:00:44Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci · 2022-07-02T01:01:17Z

@openshift-bot: This pull request references Bugzilla bug 2097736, which is invalid:

expected dependent Bugzilla bug 2097735 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is POST instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

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.

openshift-bot · 2022-07-03T01:00:43Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci · 2022-07-03T01:01:16Z

@openshift-bot: This pull request references Bugzilla bug 2097736, which is invalid:

expected dependent Bugzilla bug 2097735 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is POST instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

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.

openshift-bot · 2022-07-04T01:00:45Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci · 2022-07-04T01:01:21Z

@openshift-bot: This pull request references Bugzilla bug 2097736, which is invalid:

expected dependent Bugzilla bug 2097735 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is POST instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

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.

openshift-bot · 2022-07-05T01:01:05Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci · 2022-07-05T01:01:32Z

@openshift-bot: This pull request references Bugzilla bug 2097736, which is invalid:

expected dependent Bugzilla bug 2097735 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is POST instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

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.

openshift-bot · 2022-07-06T01:00:30Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci · 2022-07-06T01:00:57Z

@openshift-bot: This pull request references Bugzilla bug 2097736, which is invalid:

expected dependent Bugzilla bug 2097735 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is POST instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

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.

wking · 2022-07-06T20:48:36Z

/bugzilla refresh

openshift-ci · 2022-07-06T20:48:43Z

@wking: This pull request references Bugzilla bug 2097736, which is valid.

6 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.9.z) matches configured target release for branch (4.9.z)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
dependent bug Bugzilla bug 2097735 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
dependent Bugzilla bug 2097735 targets the "4.10.z" release, which is one of the valid target releases: 4.10.0, 4.10.z
bug has dependents

Requesting review from QA contact:
/cc @lihongan

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.

openshift-ci · 2022-07-06T20:50:42Z

@Miciah: All pull requests linked via external trackers have merged:

openshift/cluster-ingress-operator#786

Bugzilla bug 2097736 has been moved to the MODIFIED state.

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.

Miciah added 2 commits June 16, 2022 08:37

openshift-ci bot added bugzilla/severity-urgent Referenced Bugzilla bug's severity is urgent for the branch this PR is targeting. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Jun 16, 2022

openshift-ci bot requested review from frobware and knobunc June 16, 2022 21:31

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 16, 2022

openshift-ci bot assigned candita Jun 16, 2022

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 16, 2022

openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jun 23, 2022

openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jun 27, 2022

openshift-ci bot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Jul 6, 2022

openshift-ci bot requested a review from lihongan July 6, 2022 20:48

openshift-ci bot merged commit 9dbf3af into openshift:release-4.9 Jul 6, 2022

wking mentioned this pull request Jul 6, 2022

[release-4.9] Bug 2101429: test: switch to testing CapBnd over CapInh openshift/origin#27279

Merged

[release-4.9] Bug 2097736: Fix loadBalancerServiceAnnotationsChanged check and update #786

[release-4.9] Bug 2097736: Fix loadBalancerServiceAnnotationsChanged check and update #786

Conversation

Miciah commented Jun 16, 2022

loadBalancerServiceAnnotationsChanged: Fix update

loadBalancerServiceAnnotationsChanged: Fix check

openshift-ci bot commented Jun 16, 2022

candita commented Jun 16, 2022

openshift-ci bot commented Jun 16, 2022

openshift-bot commented Jun 17, 2022

openshift-ci bot commented Jun 17, 2022

openshift-bot commented Jun 18, 2022

openshift-ci bot commented Jun 18, 2022

openshift-bot commented Jun 19, 2022

openshift-ci bot commented Jun 19, 2022

openshift-bot commented Jun 20, 2022

openshift-ci bot commented Jun 20, 2022

openshift-bot commented Jun 21, 2022

openshift-ci bot commented Jun 21, 2022

openshift-bot commented Jun 22, 2022

openshift-ci bot commented Jun 22, 2022

openshift-bot commented Jun 23, 2022

openshift-ci bot commented Jun 23, 2022

Miciah commented Jun 23, 2022

openshift-ci bot commented Jun 23, 2022

Miciah commented Jun 23, 2022

openshift-bot commented Jun 27, 2022

openshift-ci bot commented Jun 27, 2022

lihongan commented Jun 27, 2022

openshift-bot commented Jun 28, 2022

openshift-ci bot commented Jun 28, 2022

openshift-bot commented Jun 29, 2022

openshift-ci bot commented Jun 29, 2022

openshift-bot commented Jun 30, 2022

openshift-ci bot commented Jun 30, 2022

openshift-bot commented Jul 1, 2022

openshift-ci bot commented Jul 1, 2022

openshift-bot commented Jul 2, 2022

openshift-ci bot commented Jul 2, 2022

openshift-bot commented Jul 3, 2022

openshift-ci bot commented Jul 3, 2022

openshift-bot commented Jul 4, 2022

openshift-ci bot commented Jul 4, 2022

openshift-bot commented Jul 5, 2022

openshift-ci bot commented Jul 5, 2022

openshift-bot commented Jul 6, 2022

openshift-ci bot commented Jul 6, 2022

wking commented Jul 6, 2022

openshift-ci bot commented Jul 6, 2022

openshift-ci bot commented Jul 6, 2022

`loadBalancerServiceAnnotationsChanged`: Fix update

`loadBalancerServiceAnnotationsChanged`: Fix check