Merge branch 'res-pcs-fix-driver-access' into 'develop'

RES+PCS GPU Driver access

See merge request mwvaughn/aws-hpc-recipes!141

Author: mwvaughn

recipes/pcs/login_node_for_res/assets/imagebuilder-components.yml

@@ -16,9 +16,9 @@ Parameters:
     Type: String
     Default: aws-hpc-recipes
     Description: HPC Recipes for AWS S3 bucket
-    # AllowedValues:
-    #      - aws-hpc-recipes
-    #      - aws-hpc-recipes-dev
+    AllowedValues:
+         - aws-hpc-recipes
+         - aws-hpc-recipes-dev
   HpcRecipesBranch:
     Type: String
     Default: main
@@ -54,9 +54,6 @@ Resources:
     DeletionPolicy: Delete
     UpdateReplacePolicy: Delete
     Properties:
-      Parameters:
-        HpcRecipesS3Bucket: !Ref HpcRecipesS3Bucket
-        HpcRecipesBranch: !Ref HpcRecipesBranch
       TemplateURL: !Sub 'https://${HpcRecipesS3Bucket}.s3.us-east-1.amazonaws.com/${HpcRecipesBranch}/recipes/res/res_ready_ami/assets/components/research-and-engineering-studio-vdi-linux.yaml'
       TimeoutInMinutes: 10
 

recipes/pcs/login_node_for_res/assets/main.yml

@@ -69,6 +69,20 @@ Resources:
               Effect: Allow
               Action: "s3:GetObject"
               Resource: !Sub "arn:aws:s3:::${RESEnvironment}-cluster-${AWS::Region}-${AWS::AccountId}/idea/vdc/res-ready-install-script-packages/*"
+            - Sid: GPUDriverAccess
+              Effect: Allow
+              Action: 
+                - s3:GetObject
+                - s3:ListBucket
+              Resource:
+                - "arn:aws:s3:::dcv-license.us-east-1/*"
+                - "arn:aws:s3:::ec2-linux-nvidia-drivers/*"
+                - "arn:aws:s3:::ec2-linux-nvidia-drivers"
+                - "arn:aws:s3:::nvidia-gaming/*"
+                - "arn:aws:s3:::nvidia-gaming-drivers"
+                - "arn:aws:s3:::nvidia-gaming-drivers/*"
+                - "arn:aws:s3:::ec2-amd-linux-drivers/*"
+                - "arn:aws:s3:::ec2-amd-linux-drivers"
       RoleName: !Sub "${AWS::StackName}-RES-PCS-Ec2ImageBuilderRole"
 
   RESEnvironmentImageBuilderIAMInstanceProfile:

recipes/res/res_ready_ami/assets/imagebuilder-infrastructure.yaml

@@ -78,6 +78,20 @@ Resources:
               Effect: Allow
               Action: "s3:GetObject"
               Resource: !Sub "arn:${AWS::Partition}:s3:::${EnvironmentName}-cluster-${AWS::Region}-${AWS::AccountId}/idea/vdc/res-ready-install-script-packages/*"
+            - Sid: GPUDriverAccess
+              Effect: Allow
+              Action: 
+                - s3:GetObject
+                - s3:ListBucket
+              Resource:
+                - "arn:aws:s3:::dcv-license.us-east-1/*"
+                - "arn:aws:s3:::ec2-linux-nvidia-drivers/*"
+                - "arn:aws:s3:::ec2-linux-nvidia-drivers"
+                - "arn:aws:s3:::nvidia-gaming/*"
+                - "arn:aws:s3:::nvidia-gaming-drivers"
+                - "arn:aws:s3:::nvidia-gaming-drivers/*"
+                - "arn:aws:s3:::ec2-amd-linux-drivers/*"
+                - "arn:aws:s3:::ec2-amd-linux-drivers"
       RoleName: !Sub "${EnvironmentName}-EC2InstanceProfileForImageBuilder"
 
   RESEC2InstanceProfileForImageBuilder: