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

Fix upstream AMI issue with launch templates. #228

Merged
merged 26 commits into from
Aug 24, 2022
Merged

Fix upstream AMI issue with launch templates. #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
aec8468
Merge pull request #214 from NASA-IMPACT/fix/jsii_role_issue
sharkinsspatial Aug 19, 2022
5c2925f
Change policy key for invalid compute environment.
sharkinsspatial Aug 22, 2022
76a1df1
Merge pull request #216 from NASA-IMPACT/fix/invalidcompute
sharkinsspatial Aug 22, 2022
8873a9f
Remove inline_policies for testing invalid compute.
sharkinsspatial Aug 22, 2022
38c7fb3
Merge pull request #217 from NASA-IMPACT/fix/invalidcompute
sharkinsspatial Aug 22, 2022
6bfd0b8
Determine if launch template is preventing ECS agent.
sharkinsspatial Aug 22, 2022
b7c8441
Merge pull request #218 from NASA-IMPACT/fix/invalidcompute
sharkinsspatial Aug 22, 2022
f9bf944
Revert to older ECS AMI to test compute environment validity.
sharkinsspatial Aug 22, 2022
c4c4f78
Merge pull request #219 from NASA-IMPACT/fix/invalidcompute
sharkinsspatial Aug 22, 2022
bbc5eca
Use an earlier ecs ami version.
sharkinsspatial Aug 22, 2022
3b48b6e
Merge pull request #220 from NASA-IMPACT/fix/invalidcompute
sharkinsspatial Aug 22, 2022
f064c09
Remove all possible launch issues for testing.
sharkinsspatial Aug 22, 2022
7065c83
Merge pull request #221 from NASA-IMPACT/fix/invalidcompute
sharkinsspatial Aug 22, 2022
7e6ceac
Revert batch environment changes.
sharkinsspatial Aug 22, 2022
e2e4695
Merge pull request #222 from NASA-IMPACT/fix/invalidcompute
sharkinsspatial Aug 22, 2022
451fe56
Use index value for inline_policies key.
sharkinsspatial Aug 23, 2022
31fd793
Merge pull request #223 from NASA-IMPACT/fix/invalidcompute
sharkinsspatial Aug 23, 2022
ba9f7f3
Revert inline policy change and include dependency hack.
sharkinsspatial Aug 23, 2022
4bb09c5
Merge pull request #224 from NASA-IMPACT/fix/revert_inline
sharkinsspatial Aug 23, 2022
6318cf0
Include accept flag for uninstall.
sharkinsspatial Aug 23, 2022
8c2cb0e
Merge pull request #225 from NASA-IMPACT/fix/revert_inline
sharkinsspatial Aug 23, 2022
5f295ea
Fix missing equal.
sharkinsspatial Aug 23, 2022
066dd58
Merge pull request #226 from NASA-IMPACT/fix/revert_inline
sharkinsspatial Aug 23, 2022
8dd8c30
Remove pip hacks for jsii upstream conflict.
sharkinsspatial Aug 24, 2022
337a29b
Re-implement typing fix for inline_policies.
sharkinsspatial Aug 24, 2022
36fd14e
Patch for invalid chrony package affecting new Amazon Linux 2 AMI.
sharkinsspatial Aug 24, 2022
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
4 changes: 1 addition & 3 deletions stack/hlsconstructs/batch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,7 @@ def __init__(
"CloudWatchAgentServerPolicy"
),
],
inline_policies={
"efs_document": efs_policy_document
}
inline_policies={"efspolicy": efs_policy_document},
)

ecs_instance_profile = aws_iam.CfnInstanceProfile(
Expand Down
2 changes: 1 addition & 1 deletion stack/hlsconstructs/userdata.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ packages:
- mdadm

runcmd:
- yum update -y --exclude="chrony*"
- ephemeral_disks=$(realpath -P /dev/disk/by-id/nvme*Instance_Storage* | uniq)
- ephemeral_disks_count=$(echo "$ephemeral_disks" | wc -w)
- scratch_fs=ext4
Expand Down Expand Up @@ -35,7 +36,6 @@ runcmd:
Content-Type: text/cloud-boothook; charset="us-ascii"

# Install amazon-efs-utils
cloud-init-per once yum_update yum update -y
cloud-init-per once install_amazon-efs-utils yum install -y amazon-efs-utils

# Create /efs folder
Expand Down
2 changes: 1 addition & 1 deletion stack/hlsconstructs/userdata_no_cw.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ packages:
- mdadm

runcmd:
- yum update -y --exclude="chrony*"
- ephemeral_disks=$(realpath -P /dev/disk/by-id/nvme*Instance_Storage* | uniq)
- ephemeral_disks_count=$(echo "$ephemeral_disks" | wc -w)
- scratch_fs=ext4
Expand Down Expand Up @@ -35,7 +36,6 @@ runcmd:
Content-Type: text/cloud-boothook; charset="us-ascii"

# Install amazon-efs-utils
cloud-init-per once yum_update yum update -y
cloud-init-per once install_amazon-efs-utils yum install -y amazon-efs-utils

# Create /efs folder
Expand Down