chore: update examples to use Deadline 10.3.1.3 and python to use CDK…

… 2.114.1 Signed-off-by: Caden Marofke <[email protected]>
aws · Dec 14, 2023 · 69d81ac · 69d81ac
1 parent 0254f6a
commit 69d81ac
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 19 deletions.
diff --git a/examples/deadline/All-In-AWS-Infrastructure-Basic/python/package/config.py b/examples/deadline/All-In-AWS-Infrastructure-Basic/python/package/config.py
@@ -39,10 +39,10 @@ def __init__(self):
         # to pin to. Some examples of pinned version values are "10", "10.1", or "10.1.12"
         self.deadline_version: Optional[str] = None
 
-        # A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.1.19.4 AMI ID
+        # A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.3.1.3 AMI ID
         # from us-west-2 is filled in. It can be used as-is, added to, or replaced. Ideally the version here should match the version of
         # Deadline used in any connected Deadline constructs.
-        self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-04ae356533dc07fb5'}
+        self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-08a66350b8a662070'}
 
         # A secret (in binary form) in SecretsManager that stores the UBL certificates in a .zip file.
         # This must be in the format `arn:<partition>:secretsmanager:<region>:<accountId>:secret:<secretName>-<6RandomCharacters`

diff --git a/examples/deadline/All-In-AWS-Infrastructure-Basic/python/setup.py b/examples/deadline/All-In-AWS-Infrastructure-Basic/python/setup.py
@@ -17,7 +17,7 @@
     packages=setuptools.find_packages(where="package"),
 
     install_requires=[
-        "aws-cdk-lib==2.89.0",
+        "aws-cdk-lib==2.114.1",
         "aws-rfdk==1.2.0"
     ],
 

diff --git a/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/bin/config.ts b/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/bin/config.ts
@@ -40,11 +40,11 @@ class AppConfig {
   public readonly deadlineVersion?: string;
 
   /**
-   * A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.1.20.2 AMI ID from us-west-2
+   * A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.3.1.3 AMI ID from us-west-2
    * is filled in. It can be used as-is, added to, or replaced. Ideally the version here should match the version of
    * Deadline used in any connected Deadline constructs.
    */
-  public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-0814954855da0e4c3'};
+  public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-08a66350b8a662070'};
 
   /**
    * (Optional) A secret (in binary form) in SecretsManager that stores the UBL certificates in a .zip file.

diff --git a/examples/deadline/All-In-AWS-Infrastructure-SEP/python/package/config.py b/examples/deadline/All-In-AWS-Infrastructure-SEP/python/package/config.py
@@ -12,10 +12,10 @@ class AppConfig:
     TODO: Fill these in with your own values.
     """
     def __init__(self):
-        # A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.1.19.4 AMI ID
+        # A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.3.1.3 AMI ID
         # from us-west-2 is filled in. It can be used as-is, added to, or replaced. Ideally the version here
         #  should match the one used for staging the render queue and usage based licensing recipes.
-        self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-04ae356533dc07fb5'}
+        self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-08a66350b8a662070'}
 
         # Whether the DeadlineResourceTrackerAccessRole IAM role required by Deadline's Resource Tracker should be created in this CDK app.
         #

diff --git a/examples/deadline/All-In-AWS-Infrastructure-SEP/python/setup.py b/examples/deadline/All-In-AWS-Infrastructure-SEP/python/setup.py
@@ -17,7 +17,7 @@
     packages=setuptools.find_packages(where="package"),
 
     install_requires=[
-        "aws-cdk-lib==2.89.0",
+        "aws-cdk-lib==2.114.1",
         "aws-rfdk==1.2.0"
     ],
 

diff --git a/examples/deadline/All-In-AWS-Infrastructure-SEP/ts/bin/config.ts b/examples/deadline/All-In-AWS-Infrastructure-SEP/ts/bin/config.ts
@@ -12,10 +12,10 @@ import 'source-map-support/register';
  */
 class AppConfig {
   /**
-   * A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.1.20.2 AMI ID from us-west-2
+   * A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.3.1.3 AMI ID from us-west-2
    * is filled in. It can be used as-is, added to, or replaced.
    */
-  public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-0814954855da0e4c3'};
+  public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-08a66350b8a662070'};
 
   /**
    * Whether the DeadlineResourceTrackerAccessRole IAM role required by Deadline's Resource Tracker should be created in this CDK app.

diff --git a/examples/deadline/EC2-Image-Builder/python/setup.py b/examples/deadline/EC2-Image-Builder/python/setup.py
@@ -17,7 +17,7 @@
     packages=setuptools.find_packages(where="package"),
 
     install_requires=[
-        "aws-cdk-lib==2.89.0",
+        "aws-cdk-lib==2.114.1",
         "aws-rfdk==1.2.0",
     ],
 

diff --git a/examples/deadline/Local-Zone/python/package/lib/config.py b/examples/deadline/Local-Zone/python/package/lib/config.py
@@ -37,12 +37,12 @@ def __init__(self):
         # The version of Deadline to use on the render farm. Leave as None for the latest release or specify a version
         # to pin to. Some examples of pinned version values are "10", "10.1", or "10.1.16"
         # The default value of 10.1.19 is used, to match the worker AMI ID provided below
-        self.deadline_version: Optional[str] = '10.1.19'
+        self.deadline_version: Optional[str] = '10.3.1'
 
-        # A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.1.19.4 AMI ID
+        # A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.3.1.3 AMI ID
         # from us-west-2 is filled in. It can be used as-is, added to, or replaced. Ideally the version here
         # should match the one used for staging the render queue and usage based licensing recipes.
-        self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-04ae356533dc07fb5'}
+        self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-08a66350b8a662070'}
 
         # (Optional) The name of the EC2 keypair to associate with the instances.
         self.key_pair_name: Optional[str] = None

diff --git a/examples/deadline/Local-Zone/python/setup.py b/examples/deadline/Local-Zone/python/setup.py
@@ -17,7 +17,7 @@
     packages=setuptools.find_packages(where="package"),
 
     install_requires=[
-        "aws-cdk-lib==2.89.0",
+        "aws-cdk-lib==2.114.1",
         "aws-rfdk==1.2.0"
     ],
 

diff --git a/examples/deadline/Local-Zone/ts/bin/config.ts b/examples/deadline/Local-Zone/ts/bin/config.ts
@@ -38,14 +38,14 @@ class AppConfig {
    * "10.1.16"
    * @default 10.1.20 is used, to match the worker AMI ID provided below
    */
-  public readonly deadlineVersion: string = '10.1.20';
+  public readonly deadlineVersion: string = '10.3.1';
 
   /**
-   * A map of regions to Deadline Client Linux AMIs. As an example, the Linux Deadline 10.1.20.2 AMI ID from us-west-2
+   * A map of regions to Deadline Client Linux AMIs. As an example, the Linux Deadline 10.3.1.3 AMI ID from us-west-2
    * is filled in. It can be used as-is, added to, or replaced. Ideally the version here should match the one in
    * package.json used for staging the render queue and usage based licensing recipes.
    */
-  public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-0814954855da0e4c3'};
+  public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-08a66350b8a662070'};
 
   /**
    * (Optional) The name of the EC2 keypair to associate with instances.

diff --git a/scripts/rfdk_build_environment.sh b/scripts/rfdk_build_environment.sh
@@ -42,5 +42,5 @@ docker run --rm \
     ${USER_OPT} \
     --net=host -it \
     --env DOTNET_CLI_TELEMETRY_OPTOUT=1 \
-    jsii/superchain:1-buster-slim-node18
+    jsii/superchain:1-bullseye-slim-node18