Merge pull request #683 from aws/bump/0.41.0

chore(release): 0.41.0
aws · Apr 1, 2022 · e61d72c · e61d72c
2 parents 6d319f6 + a828e99
commit e61d72c
Show file tree

Hide file tree

Showing 71 changed files with 2,792 additions and 2,416 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,9 +21,9 @@ jobs:
         node-version: [12.x, 14.x, 16.x]
 
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v3
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v2.4.0
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
     - run: npm install --global yarn

diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v3
       -
         name: Run Labeler
         if: success()

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [0.41.0](https://github.com/aws/aws-rfdk/compare/v0.40.0...v0.41.0) (2022-04-01)
+
+
+### Supported CDK Version
+
+* [1.149.0](https://github.com/aws/aws-cdk/releases/tag/v1.149.0)
+
+
+### Officially Supported Deadline Versions
+
+* [10.1.9.2 to 10.1.20.3](https://docs.thinkboxsoftware.com/products/deadline/10.1/1_User%20Manual/manual/release-notes.html)
+
 ## [0.40.0](https://github.com/aws/aws-rfdk/compare/v0.39.0...v0.40.0) (2022-01-06)
 
 

diff --git a/examples/deadline/All-In-AWS-Infrastructure-Basic/python/package/lib/network_tier.py b/examples/deadline/All-In-AWS-Infrastructure-Basic/python/package/lib/network_tier.py
@@ -119,7 +119,7 @@ def __init__(self, scope: Construct, stack_id: str, **kwargs) -> None:
         #     traffic=AclTraffic.tcp_port(22),
         #     rule_number=1
         # )
-        endpoint_subnets = SubnetSelection(subnet_type=SubnetType.PRIVATE)
+        endpoint_subnets = SubnetSelection(subnet_type=SubnetType.PRIVATE_WITH_NAT)
 
         # Add interface endpoints
         for idx, service_info in enumerate(_INTERFACE_ENDPOINT_SERVICES):

diff --git a/examples/deadline/All-In-AWS-Infrastructure-Basic/python/package/lib/subnets.py b/examples/deadline/All-In-AWS-Infrastructure-Basic/python/package/lib/subnets.py
@@ -7,7 +7,7 @@
 # Subnets for undistinguished render farm back-end infrastructure
 INFRASTRUCTURE = SubnetConfiguration(
     name='Infrastructure',
-    subnet_type=SubnetType.PRIVATE,
+    subnet_type=SubnetType.PRIVATE_WITH_NAT,
     # 1,022 IP addresses
     cidr_mask=22
 )
@@ -33,23 +33,23 @@
 # - https://github.com/aws/aws-rfdk/blob/release/packages/aws-rfdk/lib/deadline/README.md#render-queue-subnet-placement
 RENDER_QUEUE_ALB = SubnetConfiguration(
     name='RenderQueueALB',
-    subnet_type=SubnetType.PRIVATE,
+    subnet_type=SubnetType.PRIVATE_WITH_NAT,
     # 62 IP addresses
     cidr_mask=26
 )
 
 # Subnets for the Usage-Based Licensing
 USAGE_BASED_LICENSING = SubnetConfiguration(
     name='UsageBasedLicensing',
-    subnet_type=SubnetType.PRIVATE,
+    subnet_type=SubnetType.PRIVATE_WITH_NAT,
     # 14 IP addresses
     cidr_mask=28
 )
 
 # Subnets for the Worker instances
 WORKERS = SubnetConfiguration(
     name='Workers',
-    subnet_type=SubnetType.PRIVATE,
+    subnet_type=SubnetType.PRIVATE_WITH_NAT,
     # 4,094 IP addresses
     cidr_mask=20
 )
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,8 +17,8 @@
     packages=setuptools.find_packages(where="package"),
 
     install_requires=[
-        "aws-cdk.core==1.137.0",
-        "aws-rfdk==0.40.0"
+        "aws-cdk.core==1.138.0",
+        "aws-rfdk==0.41.0"
     ],
 
     python_requires=">=3.7",

diff --git a/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/lib/network-tier.ts b/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/lib/network-tier.ts
@@ -137,7 +137,7 @@ export class NetworkTier extends cdk.Stack {
     // Add the required VPC Endpoints
     // -------------
     // Subnets to add the VPC endpoints to
-    const endpointSubnets: SubnetSelection = { subnetType: SubnetType.PRIVATE };
+    const endpointSubnets: SubnetSelection = { subnetType: SubnetType.PRIVATE_WITH_NAT };
 
     // Add interface endpoints
     NetworkTier.INTERFACE_ENDPOINT_SERVICES.forEach((serviceInfo, idx) => {

diff --git a/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/lib/subnets.ts b/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/lib/subnets.ts
@@ -11,7 +11,7 @@ export class Subnets {
    */
    public static readonly INFRASTRUCTURE: SubnetConfiguration = {
     name: 'Infrastructure',
-    subnetType: SubnetType.PRIVATE,
+    subnetType: SubnetType.PRIVATE_WITH_NAT,
     // 1,022 IP addresses
     cidrMask: 22,
   };
@@ -41,7 +41,7 @@ export class Subnets {
    */
   public static readonly RENDER_QUEUE_ALB: SubnetConfiguration = {
     name: 'RenderQueueALB',
-    subnetType: SubnetType.PRIVATE,
+    subnetType: SubnetType.PRIVATE_WITH_NAT,
     // 62 IP addresses
     cidrMask: 26,
   };
@@ -51,7 +51,7 @@ export class Subnets {
    */
   public static readonly USAGE_BASED_LICENSING: SubnetConfiguration = {
     name: 'UsageBasedLicensing',
-    subnetType: SubnetType.PRIVATE,
+    subnetType: SubnetType.PRIVATE_WITH_NAT,
     // 14 IP addresses
     cidrMask: 28,
   };
@@ -61,7 +61,7 @@ export class Subnets {
    */
   public static readonly WORKERS: SubnetConfiguration = {
     name: 'Workers',
-    subnetType: SubnetType.PRIVATE,
+    subnetType: SubnetType.PRIVATE_WITH_NAT,
     // 4,094 IP addresses
     cidrMask: 20,
   };

diff --git a/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/package.json b/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "all-in-farm-basic",
-  "version": "0.40.0",
+  "version": "0.41.0",
   "bin": {
     "app": "bin/app.js"
   },
@@ -14,13 +14,13 @@
   },
   "devDependencies": {
     "@types/node": "^17.0.2",
-    "aws-cdk": "1.137.0",
+    "aws-cdk": "1.149.0",
     "ts-node": "^10.4.0",
     "typescript": "~4.5.4"
   },
   "dependencies": {
-    "@aws-cdk/core": "1.137.0",
-    "aws-rfdk": "0.40.0",
+    "@aws-cdk/core": "1.149.0",
+    "aws-rfdk": "0.41.0",
     "source-map-support": "^0.5.21"
   }
 }
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,8 +17,8 @@
     packages=setuptools.find_packages(where="package"),
 
     install_requires=[
-        "aws-cdk.core==1.137.0",
-        "aws-rfdk==0.40.0"
+        "aws-cdk.core==1.138.0",
+        "aws-rfdk==0.41.0"
     ],
 
     python_requires=">=3.7",

diff --git a/examples/deadline/All-In-AWS-Infrastructure-SEP/ts/package.json b/examples/deadline/All-In-AWS-Infrastructure-SEP/ts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "all-in-farm-sep",
-  "version": "0.40.0",
+  "version": "0.41.0",
   "bin": {
     "app": "bin/app.js"
   },
@@ -19,13 +19,13 @@
   },
   "devDependencies": {
     "@types/node": "^17.0.2",
-    "aws-cdk": "1.137.0",
+    "aws-cdk": "1.149.0",
     "ts-node": "^10.4.0",
     "typescript": "~4.5.4"
   },
   "dependencies": {
-    "@aws-cdk/core": "1.137.0",
-    "aws-rfdk": "0.40.0",
+    "@aws-cdk/core": "1.149.0",
+    "aws-rfdk": "0.41.0",
     "source-map-support": "^0.5.21"
   }
 }
diff --git a/examples/deadline/EC2-Image-Builder/python/setup.py b/examples/deadline/EC2-Image-Builder/python/setup.py
@@ -17,12 +17,12 @@
     packages=setuptools.find_packages(where="package"),
 
     install_requires=[
-        "aws-cdk.aws-iam==1.137.0",
-        "aws-cdk.aws-imagebuilder==1.137.0",
-        "aws-cdk.aws-ec2==1.137.0",
-        "aws-cdk.aws-s3-assets==1.137.0",
-        "aws-cdk.core==1.137.0",
-        "aws-rfdk==0.40.0",
+        "aws-cdk.aws-iam==1.138.0",
+        "aws-cdk.aws-imagebuilder==1.138.0",
+        "aws-cdk.aws-ec2==1.138.0",
+        "aws-cdk.aws-s3-assets==1.138.0",
+        "aws-cdk.core==1.138.0",
+        "aws-rfdk==0.41.0",
     ],
 
     python_requires=">=3.7",

diff --git a/examples/deadline/EC2-Image-Builder/ts/package.json b/examples/deadline/EC2-Image-Builder/ts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "all-in-farm-image-builder",
-  "version": "0.40.0",
+  "version": "0.41.0",
   "bin": {
     "app": "bin/app.js"
   },
@@ -15,16 +15,16 @@
   },
   "devDependencies": {
     "@types/node": "^17.0.2",
-    "aws-cdk": "1.137.0",
+    "aws-cdk": "1.149.0",
     "ts-node": "^10.4.0",
     "typescript": "~4.5.4"
   },
   "dependencies": {
-    "@aws-cdk/aws-ec2": "1.137.0",
-    "@aws-cdk/aws-iam": "1.137.0",
-    "@aws-cdk/aws-imagebuilder": "1.137.0",
-    "@aws-cdk/aws-s3-assets": "1.137.0",
-    "@aws-cdk/core": "1.137.0",
-    "aws-rfdk": "0.40.0"
+    "@aws-cdk/aws-ec2": "1.149.0",
+    "@aws-cdk/aws-iam": "1.149.0",
+    "@aws-cdk/aws-imagebuilder": "1.149.0",
+    "@aws-cdk/aws-s3-assets": "1.149.0",
+    "@aws-cdk/core": "1.149.0",
+    "aws-rfdk": "0.41.0"
   }
 }
diff --git a/examples/deadline/Local-Zone/python/package/lib/compute_tier.py b/examples/deadline/Local-Zone/python/package/lib/compute_tier.py
@@ -79,7 +79,7 @@ def __init__(self, scope: Construct, stack_id: str, *, props: ComputeTierProps,
         # We can put the health monitor and worker fleet in all of the local zones we're using
         subnets = SubnetSelection(
             availability_zones=props.availability_zones,
-            subnet_type=SubnetType.PRIVATE,
+            subnet_type=SubnetType.PRIVATE_WITH_NAT,
             one_per_az=True
         )
 

diff --git a/examples/deadline/Local-Zone/python/package/lib/network_tier.py b/examples/deadline/Local-Zone/python/package/lib/network_tier.py
@@ -86,7 +86,7 @@ def __init__(self, scope: Construct, stack_id: str, **kwargs) -> None:
                 ),
                 SubnetConfiguration(
                     name='Private',
-                    subnet_type=SubnetType.PRIVATE,
+                    subnet_type=SubnetType.PRIVATE_WITH_NAT,
                     cidr_mask=18
                 )
             ],

diff --git a/examples/deadline/Local-Zone/python/package/lib/service_tier.py b/examples/deadline/Local-Zone/python/package/lib/service_tier.py
@@ -88,7 +88,7 @@ def __init__(self, scope: Construct, stack_id: str, *, props: ServiceTierProps,
         # EFS filesystem and DocDB cluster, both of which aren't available in any local zones at this time.
         repository_subnets = SubnetSelection(
             availability_zones=props.availability_zones,
-            subnet_type=SubnetType.PRIVATE
+            subnet_type=SubnetType.PRIVATE_WITH_NAT
         )
         repository = Repository(
             self,
@@ -126,11 +126,11 @@ def __init__(self, scope: Construct, stack_id: str, *, props: ServiceTierProps,
         # all the standard zones we're using.
         render_queue_subnets = SubnetSelection(
             availability_zones=[props.availability_zones[0]],
-            subnet_type=SubnetType.PRIVATE
+            subnet_type=SubnetType.PRIVATE_WITH_NAT
         )
         render_queue_alb_subnets = SubnetSelection(
             availability_zones=props.availability_zones,
-            subnet_type=SubnetType.PRIVATE,
+            subnet_type=SubnetType.PRIVATE_WITH_NAT,
             one_per_az=True,
         )
         self.render_queue = RenderQueue(

diff --git a/examples/deadline/Local-Zone/python/setup.py b/examples/deadline/Local-Zone/python/setup.py
@@ -17,11 +17,11 @@
     packages=setuptools.find_packages(where="package"),
 
     install_requires=[
-        "aws-cdk.aws-ec2==1.137.0",
-        "aws-cdk.aws-elasticloadbalancingv2==1.137.0",
-        "aws-cdk.aws-route53==1.137.0",
-        "aws-cdk.core==1.137.0",
-        "aws-rfdk==0.40.0",
+        "aws-cdk.aws-ec2==1.138.0",
+        "aws-cdk.aws-elasticloadbalancingv2==1.138.0",
+        "aws-cdk.aws-route53==1.138.0",
+        "aws-cdk.core==1.138.0",
+        "aws-rfdk==0.41.0",
         "jsii==1.50.0",
     ],
 

diff --git a/examples/deadline/Local-Zone/ts/lib/compute-tier.ts b/examples/deadline/Local-Zone/ts/lib/compute-tier.ts
@@ -95,7 +95,7 @@ export class ComputeTier extends cdk.Stack {
     // We can put the health monitor and worker fleet in all of the local zones we're using
     const subnets: SubnetSelection = {
       availabilityZones: props.availabilityZones,
-      subnetType: SubnetType.PRIVATE,
+      subnetType: SubnetType.PRIVATE_WITH_NAT,
       onePerAz: true,
     };
 

diff --git a/examples/deadline/Local-Zone/ts/lib/network-tier.ts b/examples/deadline/Local-Zone/ts/lib/network-tier.ts
@@ -95,7 +95,7 @@ export class NetworkTier extends cdk.Stack {
         },
         {
           name: 'Private',
-          subnetType: SubnetType.PRIVATE,
+          subnetType: SubnetType.PRIVATE_WITH_NAT,
           cidrMask: 18,
         },
       ],

diff --git a/examples/deadline/Local-Zone/ts/lib/service-tier.ts b/examples/deadline/Local-Zone/ts/lib/service-tier.ts
@@ -99,7 +99,7 @@ export class ServiceTier extends Stack {
     // EFS filesystem and DocDB cluster, both of which aren't available in any local zones at this time.
     const repositorySubnets: SubnetSelection = {
       availabilityZones: props.availabilityZones,
-      subnetType: SubnetType.PRIVATE,
+      subnetType: SubnetType.PRIVATE_WITH_NAT,
     };
     const repository = new Repository(this, 'Repository', {
       vpc: props.vpc,
@@ -131,11 +131,11 @@ export class ServiceTier extends Stack {
     // all the standard zones we're using.
     const renderQueueSubnets: SubnetSelection = {
       availabilityZones: [ props.availabilityZones[0] ],
-      subnetType: SubnetType.PRIVATE,
+      subnetType: SubnetType.PRIVATE_WITH_NAT,
     };
     const renderQueueAlbSubnets: SubnetSelection = {
       availabilityZones: props.availabilityZones,
-      subnetType: SubnetType.PRIVATE,
+      subnetType: SubnetType.PRIVATE_WITH_NAT,
       onePerAz: true,
     };
     this.renderQueue = new RenderQueue(this, 'RenderQueue', {

diff --git a/examples/deadline/Local-Zone/ts/package.json b/examples/deadline/Local-Zone/ts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "all-in-farm-local-zone",
-  "version": "0.40.0",
+  "version": "0.41.0",
   "bin": {
     "app": "bin/app.js"
   },
@@ -14,16 +14,16 @@
   },
   "devDependencies": {
     "@types/node": "^17.0.2",
-    "aws-cdk": "1.137.0",
+    "aws-cdk": "1.149.0",
     "ts-node": "^10.4.0",
     "typescript": "~4.5.4"
   },
   "dependencies": {
-    "@aws-cdk/aws-ec2": "1.137.0",
-    "@aws-cdk/aws-elasticloadbalancingv2": "1.137.0",
-    "@aws-cdk/aws-route53": "1.137.0",
-    "@aws-cdk/core": "1.137.0",
-    "aws-rfdk": "0.40.0",
+    "@aws-cdk/aws-ec2": "1.149.0",
+    "@aws-cdk/aws-elasticloadbalancingv2": "1.149.0",
+    "@aws-cdk/aws-route53": "1.149.0",
+    "@aws-cdk/core": "1.149.0",
+    "aws-rfdk": "0.41.0",
     "source-map-support": "^0.5.21"
   }
 }