Fix identity assignment when labels are changed #3104
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
aanm
added
kind/bug
|
test-me-please |
aanm
force-pushed
the
new-labels-assigned
branch
from
1f4a11e
to
7a98127
Compare
|
test-me-please |
aanm
force-pushed
the
new-labels-assigned
branch
from
7a98127
to
6a5ed0d
Compare
|
test-me-please |
tgraf
requested changes
Mar 12, 2018
| @@ -1768,7 +1768,9 @@ func (e *Endpoint) identityLabelsChanged(owner Owner, myChangeRev int) error { | |||
| return nil | |||
| } | |||
|
|
|||
| if e.SecurityIdentity != nil && string(e.SecurityIdentity.Labels.SortedList()) != string(newLabels.SortedList()) { | |||
| if e.SecurityIdentity != nil && | |||
There was a problem hiding this comment.
Am I missing the change here or is this just a cosmetic change?
daemon/state.go
Outdated
| ep.SecurityIdentity.Labels = l | ||
|
|
||
| identity, _, err := identityPkg.AllocateIdentity(ep.SecurityIdentity.Labels) | ||
| l, _ := labels.FilterLabels(ep.OpLabels.AllLabels()) |
There was a problem hiding this comment.
This also includes disabled labels. That doesn't seem right. I think you want to use e.OpLabels.IdentityLabels
There was a problem hiding this comment.
oh, awesome, that's exactly what I want.
aanm
force-pushed
the
new-labels-assigned
branch
from
6a5ed0d
to
6888ffe
Compare
aanm
force-pushed
the
new-labels-assigned
branch
from
6888ffe
to
1ce2df6
Compare
|
test-me-please |
tgraf
approved these changes
Mar 12, 2018
aanm
added
the
ready-to-merge
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.
Summary of changes:
Reported by @mrdima