api: add Hostname, ExtraHosts for pause container #1278
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
adnxn
force-pushed
the
hostname-private-ip
branch
2 times, most recently
from
90d2e00
to
88f892a
Compare
adnxn
force-pushed
the
hostname-private-ip
branch
2 times, most recently
from
4a152ed
to
51a456a
Compare
adnxn
changed the title
richardpen
reviewed
Mar 19, 2018
aaithal
reviewed
Mar 19, 2018
agent/api/eni.go
Outdated
| @@ -38,6 +38,9 @@ type ENI struct { | |||
| // DomainNameSearchList specifies the search list for the domain | |||
| // name lookup, for the eni | |||
| DomainNameSearchList []string `json:",omitempty"` | |||
|
|
|||
| // PrivateDnsName is the dns name assigned by the vpc to this eni | |||
| PrivateDnsName string `json:",omitempty"` | |||
agent/api/eni.go
Outdated
| "eni id:%s, mac: %s, ipv4addresses: [%s], ipv6addresses: [%s], dns: [%s], dns search: [%s]", | ||
| eni.ID, eni.MacAddress, strings.Join(ipv4Addresses, ","), strings.Join(ipv6Addresses, ","), | ||
| "eni id:%s, mac: %s, hostname: %s, ipv4addresses: [%s], ipv6addresses: [%s], dns: [%s], dns search: [%s]", | ||
| eni.ID, eni.MacAddress, eni.PrivateDnsName, strings.Join(ipv4Addresses, ","), strings.Join(ipv6Addresses, ","), |
There was a problem hiding this comment.
shouldn't you use GetHostName() here?
|
@aaithal @richardpen, sgtm, will add(update?) functional test for this. tracking here #1307 |
adnxn
force-pushed
the
hostname-private-ip
branch
4 times, most recently
from
86afcd0
to
9f2032c
Compare
aaithal
approved these changes
Mar 19, 2018
agent/api/eni.go
Outdated
| @@ -38,6 +38,9 @@ type ENI struct { | |||
| // DomainNameSearchList specifies the search list for the domain | |||
| // name lookup, for the eni | |||
| DomainNameSearchList []string `json:",omitempty"` | |||
|
|
|||
| // PrivateDnsName is the dns name assigned by the vpc to this eni | |||
richardpen
approved these changes
Mar 20, 2018
adnxn
force-pushed
the
hostname-private-ip
branch
from
9f2032c
to
88bde97
Compare
This change adds Hostname and ExtraHosts to the pause container's docker config and host config respectively. This allows awsvpc tasks to have /etc/hosts entries for the ENI private ips
adnxn
force-pushed
the
hostname-private-ip
branch
from
88bde97
to
00cfae1
Compare
adnxn
added a commit
to adnxn/amazon-ecs-agent
that referenced
this pull request
Mar 22, 2018
adnxn
added a commit
to adnxn/amazon-ecs-agent
that referenced
this pull request
Mar 23, 2018
adnxn
added a commit
to adnxn/amazon-ecs-agent
that referenced
this pull request
Mar 23, 2018
adnxn
added a commit
that referenced
this pull request
Mar 23, 2018
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
This change adds
HostnameandExtraHoststo the pause container's dockerconfig and host config respectively. This allows awsvpc tasks to have
/etc/hostsentries for the ENI private IPsImplementation details
Testing
make release)go build -out amazon-ecs-agent.exe ./agent)make test) passgo test -timeout=25s ./agent/...) passmake run-integ-tests) pass.\scripts\run-integ-tests.ps1) passmake run-functional-tests) pass.\scripts\run-functional-tests.ps1) passNew tests cover the changes:
Description for the changelog
Licensing
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.