Skip to content

Commit e61d72c

Browse files
ddneilsonddneilson
authored
Merge pull request #683 from aws/bump/0.41.0
chore(release): 0.41.0
2 parents 6d319f6 + a828e99 commit e61d72c

File tree

71 files changed

+2792
-2416
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+2792
-2416
lines changed

‎.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ jobs:
2121
node-version: [12.x, 14.x, 16.x]
2222

2323
steps:
24-
- uses: actions/checkout@v2.3.4
24+
- uses: actions/checkout@v3
2525
- name: Use Node.js ${{ matrix.node-version }}
26-
uses: actions/setup-node@v2.4.0
26+
uses: actions/setup-node@v3
2727
with:
2828
node-version: ${{ matrix.node-version }}
2929
- run: npm install --global yarn

‎.github/workflows/labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
steps:
1414
-
1515
name: Checkout
16-
uses: actions/checkout@v2.3.4
16+
uses: actions/checkout@v3
1717
-
1818
name: Run Labeler
1919
if: success()

‎CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,18 @@
22

33
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.
44

5+
## [0.41.0](https://github.com/aws/aws-rfdk/compare/v0.40.0...v0.41.0) (2022-04-01)
6+
7+
8+
### Supported CDK Version
9+
10+
* [1.149.0](https://github.com/aws/aws-cdk/releases/tag/v1.149.0)
11+
12+
13+
### Officially Supported Deadline Versions
14+
15+
* [10.1.9.2 to 10.1.20.3](https://docs.thinkboxsoftware.com/products/deadline/10.1/1_User%20Manual/manual/release-notes.html)
16+
517
## [0.40.0](https://github.com/aws/aws-rfdk/compare/v0.39.0...v0.40.0) (2022-01-06)
618

719

‎examples/deadline/All-In-AWS-Infrastructure-Basic/python/package/lib/network_tier.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ def __init__(self, scope: Construct, stack_id: str, **kwargs) -> None:
119119
# traffic=AclTraffic.tcp_port(22),
120120
# rule_number=1
121121
# )
122-
endpoint_subnets = SubnetSelection(subnet_type=SubnetType.PRIVATE)
122+
endpoint_subnets = SubnetSelection(subnet_type=SubnetType.PRIVATE_WITH_NAT)
123123

124124
# Add interface endpoints
125125
for idx, service_info in enumerate(_INTERFACE_ENDPOINT_SERVICES):

‎examples/deadline/All-In-AWS-Infrastructure-Basic/python/package/lib/subnets.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# Subnets for undistinguished render farm back-end infrastructure
88
INFRASTRUCTURE = SubnetConfiguration(
99
name='Infrastructure',
10-
subnet_type=SubnetType.PRIVATE,
10+
subnet_type=SubnetType.PRIVATE_WITH_NAT,
1111
# 1,022 IP addresses
1212
cidr_mask=22
1313
)
@@ -33,23 +33,23 @@
3333
# - https://github.com/aws/aws-rfdk/blob/release/packages/aws-rfdk/lib/deadline/README.md#render-queue-subnet-placement
3434
RENDER_QUEUE_ALB = SubnetConfiguration(
3535
name='RenderQueueALB',
36-
subnet_type=SubnetType.PRIVATE,
36+
subnet_type=SubnetType.PRIVATE_WITH_NAT,
3737
# 62 IP addresses
3838
cidr_mask=26
3939
)
4040

4141
# Subnets for the Usage-Based Licensing
4242
USAGE_BASED_LICENSING = SubnetConfiguration(
4343
name='UsageBasedLicensing',
44-
subnet_type=SubnetType.PRIVATE,
44+
subnet_type=SubnetType.PRIVATE_WITH_NAT,
4545
# 14 IP addresses
4646
cidr_mask=28
4747
)
4848

4949
# Subnets for the Worker instances
5050
WORKERS = SubnetConfiguration(
5151
name='Workers',
52-
subnet_type=SubnetType.PRIVATE,
52+
subnet_type=SubnetType.PRIVATE_WITH_NAT,
5353
# 4,094 IP addresses
5454
cidr_mask=20
5555
)

‎examples/deadline/All-In-AWS-Infrastructure-Basic/python/setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
packages=setuptools.find_packages(where="package"),
1818

1919
install_requires=[
20-
"aws-cdk.core==1.137.0",
21-
"aws-rfdk==0.40.0"
20+
"aws-cdk.core==1.138.0",
21+
"aws-rfdk==0.41.0"
2222
],
2323

2424
python_requires=">=3.7",

‎examples/deadline/All-In-AWS-Infrastructure-Basic/ts/lib/network-tier.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ export class NetworkTier extends cdk.Stack {
137137
// Add the required VPC Endpoints
138138
// -------------
139139
// Subnets to add the VPC endpoints to
140-
const endpointSubnets: SubnetSelection = { subnetType: SubnetType.PRIVATE };
140+
const endpointSubnets: SubnetSelection = { subnetType: SubnetType.PRIVATE_WITH_NAT };
141141

142142
// Add interface endpoints
143143
NetworkTier.INTERFACE_ENDPOINT_SERVICES.forEach((serviceInfo, idx) => {

‎examples/deadline/All-In-AWS-Infrastructure-Basic/ts/lib/subnets.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export class Subnets {
1111
*/
1212
public static readonly INFRASTRUCTURE: SubnetConfiguration = {
1313
name: 'Infrastructure',
14-
subnetType: SubnetType.PRIVATE,
14+
subnetType: SubnetType.PRIVATE_WITH_NAT,
1515
// 1,022 IP addresses
1616
cidrMask: 22,
1717
};
@@ -41,7 +41,7 @@ export class Subnets {
4141
*/
4242
public static readonly RENDER_QUEUE_ALB: SubnetConfiguration = {
4343
name: 'RenderQueueALB',
44-
subnetType: SubnetType.PRIVATE,
44+
subnetType: SubnetType.PRIVATE_WITH_NAT,
4545
// 62 IP addresses
4646
cidrMask: 26,
4747
};
@@ -51,7 +51,7 @@ export class Subnets {
5151
*/
5252
public static readonly USAGE_BASED_LICENSING: SubnetConfiguration = {
5353
name: 'UsageBasedLicensing',
54-
subnetType: SubnetType.PRIVATE,
54+
subnetType: SubnetType.PRIVATE_WITH_NAT,
5555
// 14 IP addresses
5656
cidrMask: 28,
5757
};
@@ -61,7 +61,7 @@ export class Subnets {
6161
*/
6262
public static readonly WORKERS: SubnetConfiguration = {
6363
name: 'Workers',
64-
subnetType: SubnetType.PRIVATE,
64+
subnetType: SubnetType.PRIVATE_WITH_NAT,
6565
// 4,094 IP addresses
6666
cidrMask: 20,
6767
};

‎examples/deadline/All-In-AWS-Infrastructure-Basic/ts/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "all-in-farm-basic",
3-
"version": "0.40.0",
3+
"version": "0.41.0",
44
"bin": {
55
"app": "bin/app.js"
66
},
@@ -14,13 +14,13 @@
1414
},
1515
"devDependencies": {
1616
"@types/node": "^17.0.2",
17-
"aws-cdk": "1.137.0",
17+
"aws-cdk": "1.149.0",
1818
"ts-node": "^10.4.0",
1919
"typescript": "~4.5.4"
2020
},
2121
"dependencies": {
22-
"@aws-cdk/core": "1.137.0",
23-
"aws-rfdk": "0.40.0",
22+
"@aws-cdk/core": "1.149.0",
23+
"aws-rfdk": "0.41.0",
2424
"source-map-support": "^0.5.21"
2525
}
2626
}

‎examples/deadline/All-In-AWS-Infrastructure-SEP/python/setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
packages=setuptools.find_packages(where="package"),
1818

1919
install_requires=[
20-
"aws-cdk.core==1.137.0",
21-
"aws-rfdk==0.40.0"
20+
"aws-cdk.core==1.138.0",
21+
"aws-rfdk==0.41.0"
2222
],
2323

2424
python_requires=">=3.7",

‎examples/deadline/All-In-AWS-Infrastructure-SEP/ts/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "all-in-farm-sep",
3-
"version": "0.40.0",
3+
"version": "0.41.0",
44
"bin": {
55
"app": "bin/app.js"
66
},
@@ -19,13 +19,13 @@
1919
},
2020
"devDependencies": {
2121
"@types/node": "^17.0.2",
22-
"aws-cdk": "1.137.0",
22+
"aws-cdk": "1.149.0",
2323
"ts-node": "^10.4.0",
2424
"typescript": "~4.5.4"
2525
},
2626
"dependencies": {
27-
"@aws-cdk/core": "1.137.0",
28-
"aws-rfdk": "0.40.0",
27+
"@aws-cdk/core": "1.149.0",
28+
"aws-rfdk": "0.41.0",
2929
"source-map-support": "^0.5.21"
3030
}
3131
}

‎examples/deadline/EC2-Image-Builder/python/setup.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
packages=setuptools.find_packages(where="package"),
1818

1919
install_requires=[
20-
"aws-cdk.aws-iam==1.137.0",
21-
"aws-cdk.aws-imagebuilder==1.137.0",
22-
"aws-cdk.aws-ec2==1.137.0",
23-
"aws-cdk.aws-s3-assets==1.137.0",
24-
"aws-cdk.core==1.137.0",
25-
"aws-rfdk==0.40.0",
20+
"aws-cdk.aws-iam==1.138.0",
21+
"aws-cdk.aws-imagebuilder==1.138.0",
22+
"aws-cdk.aws-ec2==1.138.0",
23+
"aws-cdk.aws-s3-assets==1.138.0",
24+
"aws-cdk.core==1.138.0",
25+
"aws-rfdk==0.41.0",
2626
],
2727

2828
python_requires=">=3.7",

‎examples/deadline/EC2-Image-Builder/ts/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "all-in-farm-image-builder",
3-
"version": "0.40.0",
3+
"version": "0.41.0",
44
"bin": {
55
"app": "bin/app.js"
66
},
@@ -15,16 +15,16 @@
1515
},
1616
"devDependencies": {
1717
"@types/node": "^17.0.2",
18-
"aws-cdk": "1.137.0",
18+
"aws-cdk": "1.149.0",
1919
"ts-node": "^10.4.0",
2020
"typescript": "~4.5.4"
2121
},
2222
"dependencies": {
23-
"@aws-cdk/aws-ec2": "1.137.0",
24-
"@aws-cdk/aws-iam": "1.137.0",
25-
"@aws-cdk/aws-imagebuilder": "1.137.0",
26-
"@aws-cdk/aws-s3-assets": "1.137.0",
27-
"@aws-cdk/core": "1.137.0",
28-
"aws-rfdk": "0.40.0"
23+
"@aws-cdk/aws-ec2": "1.149.0",
24+
"@aws-cdk/aws-iam": "1.149.0",
25+
"@aws-cdk/aws-imagebuilder": "1.149.0",
26+
"@aws-cdk/aws-s3-assets": "1.149.0",
27+
"@aws-cdk/core": "1.149.0",
28+
"aws-rfdk": "0.41.0"
2929
}
3030
}

‎examples/deadline/Local-Zone/python/package/lib/compute_tier.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ def __init__(self, scope: Construct, stack_id: str, *, props: ComputeTierProps,
7979
# We can put the health monitor and worker fleet in all of the local zones we're using
8080
subnets = SubnetSelection(
8181
availability_zones=props.availability_zones,
82-
subnet_type=SubnetType.PRIVATE,
82+
subnet_type=SubnetType.PRIVATE_WITH_NAT,
8383
one_per_az=True
8484
)
8585

‎examples/deadline/Local-Zone/python/package/lib/network_tier.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def __init__(self, scope: Construct, stack_id: str, **kwargs) -> None:
8686
),
8787
SubnetConfiguration(
8888
name='Private',
89-
subnet_type=SubnetType.PRIVATE,
89+
subnet_type=SubnetType.PRIVATE_WITH_NAT,
9090
cidr_mask=18
9191
)
9292
],

‎examples/deadline/Local-Zone/python/package/lib/service_tier.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ def __init__(self, scope: Construct, stack_id: str, *, props: ServiceTierProps,
8888
# EFS filesystem and DocDB cluster, both of which aren't available in any local zones at this time.
8989
repository_subnets = SubnetSelection(
9090
availability_zones=props.availability_zones,
91-
subnet_type=SubnetType.PRIVATE
91+
subnet_type=SubnetType.PRIVATE_WITH_NAT
9292
)
9393
repository = Repository(
9494
self,
@@ -126,11 +126,11 @@ def __init__(self, scope: Construct, stack_id: str, *, props: ServiceTierProps,
126126
# all the standard zones we're using.
127127
render_queue_subnets = SubnetSelection(
128128
availability_zones=[props.availability_zones[0]],
129-
subnet_type=SubnetType.PRIVATE
129+
subnet_type=SubnetType.PRIVATE_WITH_NAT
130130
)
131131
render_queue_alb_subnets = SubnetSelection(
132132
availability_zones=props.availability_zones,
133-
subnet_type=SubnetType.PRIVATE,
133+
subnet_type=SubnetType.PRIVATE_WITH_NAT,
134134
one_per_az=True,
135135
)
136136
self.render_queue = RenderQueue(

‎examples/deadline/Local-Zone/python/setup.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
packages=setuptools.find_packages(where="package"),
1818

1919
install_requires=[
20-
"aws-cdk.aws-ec2==1.137.0",
21-
"aws-cdk.aws-elasticloadbalancingv2==1.137.0",
22-
"aws-cdk.aws-route53==1.137.0",
23-
"aws-cdk.core==1.137.0",
24-
"aws-rfdk==0.40.0",
20+
"aws-cdk.aws-ec2==1.138.0",
21+
"aws-cdk.aws-elasticloadbalancingv2==1.138.0",
22+
"aws-cdk.aws-route53==1.138.0",
23+
"aws-cdk.core==1.138.0",
24+
"aws-rfdk==0.41.0",
2525
"jsii==1.50.0",
2626
],
2727

‎examples/deadline/Local-Zone/ts/lib/compute-tier.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ export class ComputeTier extends cdk.Stack {
9595
// We can put the health monitor and worker fleet in all of the local zones we're using
9696
const subnets: SubnetSelection = {
9797
availabilityZones: props.availabilityZones,
98-
subnetType: SubnetType.PRIVATE,
98+
subnetType: SubnetType.PRIVATE_WITH_NAT,
9999
onePerAz: true,
100100
};
101101

‎examples/deadline/Local-Zone/ts/lib/network-tier.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ export class NetworkTier extends cdk.Stack {
9595
},
9696
{
9797
name: 'Private',
98-
subnetType: SubnetType.PRIVATE,
98+
subnetType: SubnetType.PRIVATE_WITH_NAT,
9999
cidrMask: 18,
100100
},
101101
],

‎examples/deadline/Local-Zone/ts/lib/service-tier.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ export class ServiceTier extends Stack {
9999
// EFS filesystem and DocDB cluster, both of which aren't available in any local zones at this time.
100100
const repositorySubnets: SubnetSelection = {
101101
availabilityZones: props.availabilityZones,
102-
subnetType: SubnetType.PRIVATE,
102+
subnetType: SubnetType.PRIVATE_WITH_NAT,
103103
};
104104
const repository = new Repository(this, 'Repository', {
105105
vpc: props.vpc,
@@ -131,11 +131,11 @@ export class ServiceTier extends Stack {
131131
// all the standard zones we're using.
132132
const renderQueueSubnets: SubnetSelection = {
133133
availabilityZones: [ props.availabilityZones[0] ],
134-
subnetType: SubnetType.PRIVATE,
134+
subnetType: SubnetType.PRIVATE_WITH_NAT,
135135
};
136136
const renderQueueAlbSubnets: SubnetSelection = {
137137
availabilityZones: props.availabilityZones,
138-
subnetType: SubnetType.PRIVATE,
138+
subnetType: SubnetType.PRIVATE_WITH_NAT,
139139
onePerAz: true,
140140
};
141141
this.renderQueue = new RenderQueue(this, 'RenderQueue', {

‎examples/deadline/Local-Zone/ts/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "all-in-farm-local-zone",
3-
"version": "0.40.0",
3+
"version": "0.41.0",
44
"bin": {
55
"app": "bin/app.js"
66
},
@@ -14,16 +14,16 @@
1414
},
1515
"devDependencies": {
1616
"@types/node": "^17.0.2",
17-
"aws-cdk": "1.137.0",
17+
"aws-cdk": "1.149.0",
1818
"ts-node": "^10.4.0",
1919
"typescript": "~4.5.4"
2020
},
2121
"dependencies": {
22-
"@aws-cdk/aws-ec2": "1.137.0",
23-
"@aws-cdk/aws-elasticloadbalancingv2": "1.137.0",
24-
"@aws-cdk/aws-route53": "1.137.0",
25-
"@aws-cdk/core": "1.137.0",
26-
"aws-rfdk": "0.40.0",
22+
"@aws-cdk/aws-ec2": "1.149.0",
23+
"@aws-cdk/aws-elasticloadbalancingv2": "1.149.0",
24+
"@aws-cdk/aws-route53": "1.149.0",
25+
"@aws-cdk/core": "1.149.0",
26+
"aws-rfdk": "0.41.0",
2727
"source-map-support": "^0.5.21"
2828
}
2929
}

0 commit comments

Comments
 (0)