Skip to content
This repository was archived by the owner on Oct 9, 2020. It is now read-only.

Commit 0b0cba0

Browse files
committed
Allow user to customize Roles / ManagedPolicy
Signed-off-by: Nicolas De Loof <[email protected]>
1 parent 5277509 commit 0b0cba0

File tree

3 files changed

+18
-5
lines changed

3 files changed

+18
-5
lines changed

pkg/amazon/backend/cloudformation.go

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -440,15 +440,26 @@ func createTaskExecutionRole(service types.ServiceConfig, err error, definition
440440
PolicyDocument: policy,
441441
PolicyName: fmt.Sprintf("%sGrantAccessToSecrets", service.Name),
442442
})
443+
}
443444

445+
if roles, ok := service.Extensions[compose.ExtensionRole]; ok {
446+
rolePolicies = append(rolePolicies, iam.Role_Policy{
447+
PolicyDocument: roles,
448+
})
449+
}
450+
managedPolicies := []string{
451+
ECSTaskExecutionPolicy,
452+
ECRReadOnlyPolicy,
453+
}
454+
if v, ok := service.Extensions[compose.ExtensionManagedPolicies]; ok {
455+
for _, s := range v.([]interface{}) {
456+
managedPolicies = append(managedPolicies, s.(string))
457+
}
444458
}
445459
template.Resources[taskExecutionRole] = &iam.Role{
446460
AssumeRolePolicyDocument: assumeRolePolicyDocument,
447461
Policies: rolePolicies,
448-
ManagedPolicyArns: []string{
449-
ECSTaskExecutionPolicy,
450-
ECRReadOnlyPolicy,
451-
},
462+
ManagedPolicyArns: managedPolicies,
452463
}
453464
return taskExecutionRole, nil
454465
}

pkg/amazon/backend/iam.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ var assumeRolePolicyDocument = PolicyDocument{
2222
},
2323
}
2424

25-
// could alternatively depend on https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/master/pkg/cloud/services/iam/types.go#L52
25+
// could alternatively depend on https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/master/cmd/clusterawsadm/api/iam/v1alpha1/types.go
2626
type PolicyDocument struct {
2727
Version string `json:",omitempty"`
2828
Statement []PolicyStatement `json:",omitempty"`

pkg/compose/x.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,6 @@ const (
1010
ExtensionMinPercent = "x-aws-min_percent"
1111
ExtensionMaxPercent = "x-aws-max_percent"
1212
ExtensionRetention = "x-aws-logs_retention"
13+
ExtensionRole = "x-aws-role"
14+
ExtensionManagedPolicies = "x-aws-policies"
1315
)

0 commit comments

Comments
 (0)