diff --git a/pkg/amazon/backend/cloudformation.go b/pkg/amazon/backend/cloudformation.go index aa43dbe..c6c033d 100644 --- a/pkg/amazon/backend/cloudformation.go +++ b/pkg/amazon/backend/cloudformation.go @@ -440,15 +440,26 @@ func createTaskExecutionRole(service types.ServiceConfig, err error, definition PolicyDocument: policy, PolicyName: fmt.Sprintf("%sGrantAccessToSecrets", service.Name), }) + } + if roles, ok := service.Extensions[compose.ExtensionRole]; ok { + rolePolicies = append(rolePolicies, iam.Role_Policy{ + PolicyDocument: roles, + }) + } + managedPolicies := []string{ + ECSTaskExecutionPolicy, + ECRReadOnlyPolicy, + } + if v, ok := service.Extensions[compose.ExtensionManagedPolicies]; ok { + for _, s := range v.([]interface{}) { + managedPolicies = append(managedPolicies, s.(string)) + } } template.Resources[taskExecutionRole] = &iam.Role{ AssumeRolePolicyDocument: assumeRolePolicyDocument, Policies: rolePolicies, - ManagedPolicyArns: []string{ - ECSTaskExecutionPolicy, - ECRReadOnlyPolicy, - }, + ManagedPolicyArns: managedPolicies, } return taskExecutionRole, nil } diff --git a/pkg/amazon/backend/iam.go b/pkg/amazon/backend/iam.go index 81a4fdb..4b28202 100644 --- a/pkg/amazon/backend/iam.go +++ b/pkg/amazon/backend/iam.go @@ -22,7 +22,7 @@ var assumeRolePolicyDocument = PolicyDocument{ }, } -// could alternatively depend on https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/master/pkg/cloud/services/iam/types.go#L52 +// could alternatively depend on https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/master/cmd/clusterawsadm/api/iam/v1alpha1/types.go type PolicyDocument struct { Version string `json:",omitempty"` Statement []PolicyStatement `json:",omitempty"` diff --git a/pkg/compose/x.go b/pkg/compose/x.go index 63f2e30..3a4ffdb 100644 --- a/pkg/compose/x.go +++ b/pkg/compose/x.go @@ -10,4 +10,6 @@ const ( ExtensionMinPercent = "x-aws-min_percent" ExtensionMaxPercent = "x-aws-max_percent" ExtensionRetention = "x-aws-logs_retention" + ExtensionRole = "x-aws-role" + ExtensionManagedPolicies = "x-aws-policies" )