Added EFSVolumeConfiguration #2234
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
sparrc
force-pushed
the
efs-volumes
branch
2 times, most recently
from
096a9ca
to
523741d
Compare
sparrc
commented
Oct 9, 2019
| @@ -285,6 +285,22 @@ func TaskFromACS(acsTask *ecsacs.Task, envelope *ecsacs.PayloadMessage) (*Task, | |||
| return task, nil | |||
| } | |||
|
|
|||
| func (task *Task) initializeVolumes(cfg *config.Config, dockerClient dockerapi.DockerClient, ctx context.Context) error { | |||
There was a problem hiding this comment.
this had to be factored out to make gocyclo happy
petderek
reviewed
Oct 10, 2019
petderek
approved these changes
Oct 10, 2019
sharanyad
reviewed
Oct 10, 2019
agent/acs/model/ecsacs/api.go
Outdated
| type EFSVolumeConfiguration struct { | ||
| _ struct{} `type:"structure"` | ||
|
|
||
| Filesystem *string `locationName:"filesystem" type:"string"` |
There was a problem hiding this comment.
FilesystemID makes more sense
There was a problem hiding this comment.
I've changed it to FilesystemId as this is auto-generated code that depends on the ACS model, which will have the d lowercase.
yumex93
reviewed
Oct 11, 2019
agent/acs/model/api/api-2.json
Outdated
| "EFSVolumeConfiguration": { | ||
| "type":"structure", | ||
| "members":{ | ||
| "filesystemId":{"shape":"String"}, |
There was a problem hiding this comment.
In our PRFAQ, this attribute is defined as filesystem, ACS will keep the consistency and use filesystem. Just a reminder that we may want to wait for ACS model get finalized and regenerate the file again.
There was a problem hiding this comment.
yep, the exact shape of this is subject to change, we'll keep this code in a feature branch until the ACS model is finalized
sparrc
added a commit
that referenced
this pull request
Nov 5, 2019
* Added EFSVolumeConfiguration models * Translate EFS volumes from ACS to Docker volume type * fix gocyclo failure * code review comments * remove readonly config * remove readonly options from code * code review comments * code review * naming is hard
sparrc
added a commit
that referenced
this pull request
Dec 4, 2019
* Added EFSVolumeConfiguration models * Translate EFS volumes from ACS to Docker volume type * fix gocyclo failure * code review comments * remove readonly config * remove readonly options from code * code review comments * code review * naming is hard
sparrc
added a commit
that referenced
this pull request
Dec 5, 2019
* Added EFSVolumeConfiguration models * Translate EFS volumes from ACS to Docker volume type * fix gocyclo failure * code review comments * remove readonly config * remove readonly options from code * code review comments * code review * naming is hard
sparrc
added a commit
that referenced
this pull request
Dec 6, 2019
* Added EFSVolumeConfiguration (#2234) * Added EFSVolumeConfiguration models * Translate EFS volumes from ACS to Docker volume type * fix gocyclo failure * code review comments * remove readonly config * remove readonly options from code * code review comments * code review * naming is hard * Add efs capability (#2248) * EFS functional testing (#2247) * Add efs client to Gopkg.* * Add efs client to vendor directory * EFS functional test * Reuse EFS filesystem and mount target(s) * review fixups * more code review fixups * EFSVolumeConfiguration -> efsVolumeConfiguration (#2254) * EFSVolumeConfiguration -> efsVolumeConfiguration * Fix FileSystemId and write json marshalling unit tests * unit test PostUnmarshalTask efsVolumeConfiguration behavior * windows unit test fix * Update ECS client and task defs (#2256) * add memoryUnbounded to task volume marshal unit tests * rebase mistake
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 adds support for a new field in the task definition: EFSVolumeConfiguration
For now we only support a minimal version of EFS support that essentially just translates the EFS volume configuration into an NFS docker volume.
In the future we expect to roll out support for EFS-specific features by utilizing the efs-agent to mount the volumes.
Implementation details
ECS already supports a field
dockerVolumeConfigurationin the task definition that can be used to mount EFS volumes via NFS (see here). By utilizing this, we can translateEFSVolumeConfigurationinto a dockerVolumeConfiguration for basic support of mounting EFS volumes (although without support for EFS-specific features).The plan is to maintain this "simple mode" mount whenever customers want to mount an EFS volume without utilizing any EFS-specific features. Simple EFS configuration would look something like this:
Testing
New tests cover the changes: yes
Description for the changelog
Added support for EFSVolumeConfiguration in task definition
Licensing
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.