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

[IT-2968] Revert IT-2360 due to ampad deployment failure #226

Merged
merged 2 commits into from
Jun 29, 2023
Merged

[IT-2968] Revert IT-2360 due to ampad deployment failure #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a97fa39
Revert "Add in tower configuration to allow instance credentials"
zaro0508 Jun 29, 2023
4b6a843
Revert "[IT-2360] Setup IAM roles for tower"
zaro0508 Jun 29, 2023
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
1 change: 0 additions & 1 deletion src/tower/resources/environment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,3 @@ TOWER_OIDC_TOKEN_IMPORT: "!If [ HasTowerOidcClient, !Ref TowerOidcTokenImport, !
TOWER_ROOT_USERS: "!If [ HasTowerRootUsers, !Join [',', !Ref TowerRootUsers], !Ref AWS::NoValue]"
TOWER_USER_WORKSPACE_ENABLED: "!Ref 'TowerUserWorkspace'"
TOWER_CONFIG_FILE: "!Sub '${EfsVolumeMountPath}/${TowerConfigFileName}'"
TOWER_ALLOW_INSTANCE_CREDENTIALS: "true"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this be reverted as well @thomasyu888 ? or should it be kept in place?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can remove for now. Lets add it back in later

38 changes: 0 additions & 38 deletions templates/tower-project.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,39 +141,6 @@ Resources:
Service:
- ecs-tasks.amazonaws.com

TowerRole:
Type: "AWS::IAM::Role"
Properties:
ManagedPolicyArns:
- 'Fn::ImportValue': !Sub ${AWS::Region}-nextflow-forge-iam-policy-NextFlowForgePolicyArn
- 'Fn::ImportValue': !Sub ${AWS::Region}-nextflow-launch-iam-policy-NextFlowLaunchPolicyArn
AssumeRolePolicyDocument:
Version: '2012-10-17'
Statement:
- Effect: Allow
Principal:
Service: ec2.amazonaws.com
Action: sts:AssumeRole
- Effect: Allow
Principal:
Service: ecs-tasks.amazonaws.com
Action: sts:AssumeRole
- Effect: Allow
Principal:
Service: eks.amazonaws.com
Action: sts:AssumeRole
- Sid: AllowEc2AssumeRole
Effect: Allow
Principal:
AWS: !Ref AccountAdminArns
Action: sts:AssumeRole
- Sid: AllowEcsServiceRole2AssumeRole
Effect: Allow
Principal:
AWS:
- 'Fn::ImportValue': !Sub ${AWS::Region}-nextflow-ecs-service-EcsServiceRoleArn
Action: sts:AssumeRole

TowerForgeBatchHeadJobPolicy:
Type: AWS::IAM::Policy
Properties:
Expand Down Expand Up @@ -616,11 +583,6 @@ Outputs:
Export:
Name: !Sub "${AWS::Region}-${AWS::StackName}-TowerForgeServiceRoleArn"

TowerRoleArn:
Value: !GetAtt TowerRole.Arn
Export:
Name: !Sub "${AWS::Region}-${AWS::StackName}-TowerRoleArn"

TowerForgeBatchHeadJobRole:
Value: !Ref TowerForgeBatchHeadJobRole
Export:
Expand Down