Retain existing OwnerReferences #130
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Looking into these failing integration tests. |
|
Missing RBAC "get" for secret. Fixed now. |
|
FWIW, we're now running this latest build in production and it has resolved the problem for us. |
|
@anguslees, any chance to get this merged soon? |
anguslees
reviewed
Jan 9, 2019
| if err != nil { | ||
| return nil, fmt.Errorf("failed to read existing secret: %s", err) | ||
| } | ||
| existingSecret.Data = newSecret.Data |
There was a problem hiding this comment.
existingSecret may have come from a shared cache above, so you need to copy it before modifying it:
existingSecret = existingSecret.DeepCopy()
|
otherwise lgtm, thanks! (apologies for not responding earlier - kubecon, holidays, and other excuses) |
|
@anguslees No worries. Thanks for taking a look. I think I have addressed your concerns. Could you re-review? |
|
@anguslees Could you give this another once-over? Keen to getting it merged. |
bors bot
added a commit
that referenced
this pull request
Feb 8, 2019
130: Retain existing OwnerReferences r=anguslees a=gargath This PR ensures that existing `OwnerReferences` on Secrets managed by the controller are retained when a Secret is reconciled. When an existing Secret is found, the controller will now merge existing OwnerReferences with its own, ensuring that other controllers can use OwnerReferences safely to track these Secrets. Fixes #127 Co-authored-by: Phil Taprogge <philt@pusher.com> Co-authored-by: Joel Speed <joel.speed@hotmail.co.uk>
Build succeeded |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR ensures that existing
OwnerReferenceson Secrets managed by the controller are retained when a Secret is reconciled.When an existing Secret is found, the controller will now merge existing OwnerReferences with its own, ensuring that other controllers can use OwnerReferences safely to track these Secrets.
Fixes #127