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

Efs support #2

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

Efs support #2

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
1bc10f7
Update sdk dependency
bvtujo Apr 30, 2020
ccade5e
add EFS volume struct to converter
bvtujo Apr 30, 2020
d9858e4
hardcode fargate platform 1.4.0 for efs
bvtujo May 1, 2020
1e7cd18
Add working unit test
bvtujo May 8, 2020
ec3ca84
Update mocks and clients
bvtujo May 8, 2020
5b6c58b
Add platform version todo
bvtujo May 8, 2020
e2f1b99
Update ecs-cli/modules/cli/compose/entity/service/service.go
bvtujo May 19, 2020
5c10c9f
Add warnings and logic for switching PV to 1.4.0 for EFS tasks
bvtujo May 20, 2020
e5bf26d
Remove unnecessary asserts and print in convert task def test
bvtujo May 20, 2020
b1c707d
Add error if EFS volume name is not specified
bvtujo May 20, 2020
932633b
Rename temp var from dvol to vol to reduce confusion
bvtujo May 20, 2020
04f1f7c
Update ecs-params in readme
bvtujo May 21, 2020
67ea655
add section describing EFS to readme
bvtujo May 21, 2020
ce63155
Add example ECS params with EFS
bvtujo May 21, 2020
80ecf60
Edit warning to imply that we will use PV 1.4.0 if necessary
bvtujo May 21, 2020
702c0cd
fix error message in efs volume
bvtujo May 21, 2020
d26c48b
Add error case unit tests
bvtujo May 21, 2020
d687d58
Update ecs-params reference to only comment on finite/conditional params
bvtujo May 26, 2020
7cc516e
Merge branch 'master' into efs-support
mergify[bot] May 26, 2020
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
6 changes: 3 additions & 3 deletions ecs-cli/Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ecs-cli/Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

[[constraint]]
name = "github.com/aws/aws-sdk-go"
version = "^1.29.0"
version = "^1.30.7"

[[constraint]]
name = "github.com/awslabs/amazon-ecr-credential-helper"
Expand Down
30 changes: 30 additions & 0 deletions ecs-cli/modules/cli/compose/entity/mock/entity.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions ecs-cli/modules/cli/compose/entity/service/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ var waitUntilSDSDeletable route53.WaitUntilSDSDeletableFunc = route53.WaitUntilS
// NewService creates an instance of a Service and also sets up a cache for task definition
func NewService(ecsContext *context.ECSContext) entity.ProjectEntity {
return &Service{
cache: entity.SetupTaskDefinitionCache(),
ecsContext: ecsContext,
cache: entity.SetupTaskDefinitionCache(),
ecsContext: ecsContext,
}
}

Expand Down Expand Up @@ -513,6 +513,8 @@ func (s *Service) buildCreateServiceInput(serviceName, taskDefName string, desir
DeploymentConfiguration: s.deploymentConfig,
LoadBalancers: []*ecs.LoadBalancer{s.loadBalancer},
Role: aws.String(s.role),
// TODO: revert to "LATEST" when latest refers to 1.4.0
bvtujo marked this conversation as resolved.
Show resolved Hide resolved
PlatformVersion: aws.String("1.4.0"),
}

if schedulingStrategy != "" {
Expand Down
2 changes: 2 additions & 0 deletions ecs-cli/modules/cli/compose/factory/mock/factory.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading