Skip to content
This repository has been archived by the owner on Nov 9, 2022. It is now read-only.

Fix retry apply on conflict #42

Merged
merged 1 commit into from
Mar 31, 2020
Merged

Fix retry apply on conflict #42

merged 1 commit into from
Mar 31, 2020

Conversation

timebertt
Copy link
Contributor

What this PR does / why we need it:
Fix retry apply on conflict for managed objects, so that the controller does not run into backoff on conflict, but instead retries applying directly.

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Release note:

A bug has been fixed, which made `gardener-resource-manager` fail to apply all new objects, if there were conflicting changes on those objects, instead of retrying the update request.

@timebertt timebertt requested a review from a team as a code owner March 30, 2020 10:48
@gardener-robot-ci-2 gardener-robot-ci-2 added reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels Mar 30, 2020
@rfranzke rfranzke merged commit 8590d0a into gardener-attic:master Mar 31, 2020
@timebertt timebertt deleted the fix/retry-on-conflict branch April 2, 2020 07:11
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@rfranzke rfranzke rfranzke approved these changes

Assignees
No one assigned
Labels
needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@timebertt @rfranzke @gardener-robot-ci-2