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.

Sign up for GitHub

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

Jump to bottom

Only run update logic if objects are actually different #160

Merged
merged 1 commit into from
May 24, 2019
Merged

Only run update logic if objects are actually different #160

merged 1 commit into from
May 24, 2019

Conversation

rcarrillocruz
Copy link
Contributor

Fixes SDN-387

@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Apr 30, 2019
danwinship
danwinship reviewed Apr 30, 2019
View reviewed changes
pkg/apply/apply.go Outdated Show resolved Hide resolved
@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 30, 2019
@openshift-ci-robot openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels May 3, 2019
@rcarrillocruz
Copy link
Contributor Author

/retest

1 similar comment
@rcarrillocruz
Copy link
Contributor Author

/retest

squeed
squeed reviewed May 7, 2019
View reviewed changes
pkg/apply/apply.go Outdated
if err := MergeObjectForUpdate(existing, obj); err != nil {
return errors.Wrapf(err, "could not merge object %s with existing", objDesc)
}
creationTimeStamp := existing.GetCreationTimestamp()
Copy link
Contributor

@squeed squeed May 7, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would prefer if this block of code was part of MergeObjectForUpdate

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so pushing down the comparison down to Merge?

Just moving the 'backup' fields logic won't do.

squeed
squeed reviewed May 7, 2019
View reviewed changes
pkg/apply/apply.go Outdated Show resolved Hide resolved
@openshift-ci-robot openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 14, 2019
@rcarrillocruz
Copy link
Contributor Author

/retest

@squeed
Copy link
Contributor

squeed commented May 15, 2019

One dockblock update, then this looks good. Just rebase + squash, and we can get this merged.

@openshift-ci-robot openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels May 16, 2019
@rcarrillocruz rcarrillocruz force-pushed the fix_sdn387 branch 2 times, most recently from 8d1796c to 32265d0 Compare May 16, 2019 14:19
@rcarrillocruz
Copy link
Contributor Author

/retest

@squeed
Copy link
Contributor

squeed commented May 16, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels May 16, 2019
@rcarrillocruz
Copy link
Contributor Author

/retest

2 similar comments
@rcarrillocruz
Copy link
Contributor Author

/retest

@rcarrillocruz
Copy link
Contributor Author

/retest

@rcarrillocruz
Copy link
Contributor Author

/retest

3 similar comments
@rcarrillocruz
Copy link
Contributor Author

/retest

@rcarrillocruz
Copy link
Contributor Author

/retest

@rcarrillocruz
Copy link
Contributor Author

/retest

@squeed
Copy link
Contributor

squeed commented May 17, 2019

CI seems to be pretty reliable, >75% pass rate. I'd dig in to the artifacts (cluster logs) and see if something's not working.

@rcarrillocruz
Copy link
Contributor Author

/retest

2 similar comments
@rcarrillocruz
Copy link
Contributor Author

/retest

@rcarrillocruz
Copy link
Contributor Author

/retest

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label May 22, 2019
@squeed
Copy link
Contributor

squeed commented May 23, 2019

/approve

@squeed
Copy link
Contributor

squeed commented May 23, 2019

er,
/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label May 23, 2019
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rcarrillocruz, squeed

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

@squeed
Copy link
Contributor

squeed commented May 24, 2019

Given that @danwinship's comments were addressed,
/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 24, 2019
@openshift-merge-robot openshift-merge-robot merged commit 1cc24f4 into openshift:master May 24, 2019
@danwinship
Copy link
Contributor

oh, sorry, I missed that it was stuck on my hold

@phoracek phoracek mentioned this pull request Jun 3, 2019
Closed
11 tasks
@pitiK3U pitiK3U mentioned this pull request Jun 12, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@danwinship danwinship danwinship left review comments

@squeed squeed squeed left review comments

@knobunc knobunc Awaiting requested review from knobunc

Assignees

@squeed squeed

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@rcarrillocruz @squeed @openshift-ci-robot @danwinship @openshift-merge-robot