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

Bug 1873728: publishRecordToZones: Fix status merge #446

Conversation

Miciah
Copy link
Contributor

@Miciah Miciah commented Aug 29, 2020

In publishRecordToZones, when merging the updated status with the input status in order to produce the output status, first make a copy of the input status, and use the copy to avoid mutating the input status.

Before this change, publishRecordToZones mutated the input status, and so when the caller compared the input status with the output status, it would always find them to be identical. As a result, the caller never updated the DNSRecord's status in the API, which caused the DNS controller to endlessly retry the update and the ingress controller to report DNSReady=False.

  • pkg/operator/controller/dns/controller.go (publishRecordToZones): Make a copy of the zone statuses, and pass the copy to mergeStatuses to avoid mutating the original zone statuses that the caller passed in.
  • pkg/operator/controller/dns/controller_test.go (TestPublishRecordToZonesMergesStatus): Verify that publishRecordToZones does not mutate the status.

/cherry-pick release-4.5

In publishRecordToZones, when merging the updated status with the input
status in order to produce the output status, first make a copy of the
input status, and use the copy to avoid mutating the input status.

Before this change, publishRecordToZones mutated the input status, and so
when the caller compared the input status with the output status, it would
always find them to be identical.  As a result, the caller never updated
the DNSRecord's status in the API, which caused the DNS controller to
endlessly retry the update and the ingress controller to report
DNSReady=False.

* pkg/operator/controller/dns/controller.go (publishRecordToZones): Make a
copy of the zone statuses, and pass the copy to mergeStatuses to avoid
mutating the original zone statuses that the caller passed in.
* pkg/operator/controller/dns/controller_test.go
(TestPublishRecordToZonesMergesStatus): Verify that publishRecordToZones
does not mutate the status.
@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. label Aug 29, 2020
@openshift-ci-robot
Copy link
Contributor

@Miciah: This pull request references Bugzilla bug 1873728, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.6.0) matches configured target release for branch (4.6.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1873728: publishRecordToZones: Fix status merge

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-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Aug 29, 2020
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 29, 2020
@sgreene570
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 31, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

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

@openshift-merge-robot openshift-merge-robot merged commit e0dd693 into openshift:master Aug 31, 2020
@openshift-ci-robot
Copy link
Contributor

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

Bugzilla bug 1873728 has been moved to the MODIFIED state.

In response to this:

Bug 1873728: publishRecordToZones: Fix status merge

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
Copy link
Contributor Author

Miciah commented Aug 31, 2020

/cherry-pick release-4.5

@openshift-cherrypick-robot

@Miciah: new pull request created: #449

In response to this:

/cherry-pick release-4.5

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. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants