Skip to content

Commit

Permalink
PLAT-6225: Remove GPU remediation entirely (#132)
Browse files Browse the repository at this point in the history
* Revert "Update gpu remediation (#130)"

This reverts commit 462a736.

* Revert original gpu remediation
  • Loading branch information
Secretions authored Feb 23, 2023
1 parent d5b20dc commit d33ebd1
Showing 1 changed file with 3 additions and 17 deletions.
20 changes: 3 additions & 17 deletions cdk/domino_cdk/provisioners/eks/eks_nodegroup.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,7 @@ def provision_managed_nodegroup(
machine_image: Optional[ec2.IMachineImage] = (
ec2.MachineImage.generic_linux({region: ng.ami_id}) if ng.ami_id else None
)
mime_user_data: Optional[ec2.UserData] = self._handle_user_data(
name, ng.ami_id, False, ng.ssm_agent, [ng.user_data]
)
mime_user_data: Optional[ec2.UserData] = self._handle_user_data(name, ng.ami_id, ng.ssm_agent, [ng.user_data])

lt = self._launch_template(
self.cluster,
Expand Down Expand Up @@ -169,9 +167,7 @@ def provision_unmanaged_nodegroup(
).items():
cdk.Tags.of(asg).add(str(k), str(v), apply_to_launched_instances=True)

mime_user_data = self._handle_user_data(
name, ng.ami_id, ng.gpu, ng.ssm_agent, [ng.user_data, asg.user_data]
)
mime_user_data = self._handle_user_data(name, ng.ami_id, ng.ssm_agent, [ng.user_data, asg.user_data])

if not cfn_lt:
lt = self._launch_template(
Expand Down Expand Up @@ -243,7 +239,7 @@ def provision_unmanaged_nodegroup(
self.cluster.connect_auto_scaling_group_capacity(asg, **options)

def _handle_user_data(
self, name: str, custom_ami: bool, gpu: bool, ssm_agent: bool, user_data_list: List[Union[ec2.UserData, str]]
self, name: str, custom_ami: bool, ssm_agent: bool, user_data_list: List[Union[ec2.UserData, str]]
) -> Optional[ec2.UserData]:
mime_user_data = ec2.MultipartUserData()

Expand All @@ -258,16 +254,6 @@ def _handle_user_data(
),
)

if gpu:
mime_user_data.add_part(
ec2.MultipartBody.from_user_data(
ec2.UserData.custom(
'EKS_CONTAINERD_CFG="/etc/eks/containerd/containerd-config.toml"\n'
"sed -i 's/plugins\.\"io.containerd.grpc.v1.cri\"\.registry/plugins.cri.registry/' $EKS_CONTAINERD_CFG\n"
)
)
)

# if not custom AMI, we can install ssm agent. If requested.
if ssm_agent:
mime_user_data.add_part(
Expand Down

0 comments on commit d33ebd1

Please sign in to comment.