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

Add support for externalId as an optional annotation #213

Merged
merged 7 commits into from
Jul 29, 2019
Merged

Add support for externalId as an optional annotation #213

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
053a2a9
Add support for externalId as an optional annotation
ColinHebert May 17, 2019
df22fae
Tidy up by removing experiments
ColinHebert May 17, 2019
ed21e1f
Return an empty string rather than nil on failure
ColinHebert May 21, 2019
a4364c1
Add exponential backoff on externalId
ColinHebert May 21, 2019
43b6580
Rename externalId into externalID
ColinHebert May 21, 2019
35890df
Except for the AWS api
ColinHebert May 21, 2019
2b58582
More id to ID
ColinHebert May 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Return an empty string rather than nil on failure
  • Loading branch information
@ColinHebert
ColinHebert committed May 21, 2019
commit ed21e1f8cb929fb25c9fede26ada1a9c1bd4beb1
2 changes: 1 addition & 1 deletion mappings/mapper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func (r *RoleMapper) GetExternalIdMapping(IP string) (string, error) {
pod, err := r.store.PodByIP(IP)
// If attempting to get a Pod that maps to multiple IPs
if err != nil {
return nil, err
return "", err
}

externalId, _ := pod.GetAnnotations()[r.iamExternalIdKey]
Expand Down