Skip to content

Commit 73378f2

Browse files
fix(opensearch): add I4G to list of OpenSearch nodes not requiring EBS volumes (#31948)
### Issue # (if applicable) Closes #31764 ### Reason for this change CDK is failing to deploy OpenSearch with I4G nodes with error message indicating that EBS configuration is required. However, OpenSearch clusters with I4G nodes use instance store and cannot be configured with EBS storage. ### Description of changes This change adds I4G node type to the list of OpenSearch nodes that does not support EBS volumes in the cluster configuration. ### Description of how you validated changes Added unit tests and run them successfully Ran integration test on private account ### Checklist - [x] My code adheres to the [CONTRIBUTING GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and [DESIGN GUIDELINES](https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md) ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent afc2b0d commit 73378f2

File tree

11 files changed

+470
-12
lines changed

11 files changed

+470
-12
lines changed

packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.ebs.js.snapshot/IntegDefaultTestDeployAssert4E6713E1.assets.json

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.ebs.js.snapshot/IntegDefaultTestDeployAssert4E6713E1.template.json

Lines changed: 36 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.ebs.js.snapshot/cdk-integ-opensearch-instance-store.assets.json

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
{
2+
"Resources": {
3+
"Domain66AC69E0": {
4+
"Type": "AWS::OpenSearchService::Domain",
5+
"Properties": {
6+
"ClusterConfig": {
7+
"DedicatedMasterEnabled": false,
8+
"InstanceCount": 1,
9+
"InstanceType": "i4g.large.search",
10+
"MultiAZWithStandbyEnabled": false,
11+
"ZoneAwarenessEnabled": false
12+
},
13+
"DomainEndpointOptions": {
14+
"EnforceHTTPS": false,
15+
"TLSSecurityPolicy": "Policy-Min-TLS-1-0-2019-07"
16+
},
17+
"EBSOptions": {
18+
"EBSEnabled": false
19+
},
20+
"EncryptionAtRestOptions": {
21+
"Enabled": false
22+
},
23+
"EngineVersion": "OpenSearch_2.5",
24+
"LogPublishingOptions": {},
25+
"NodeToNodeEncryptionOptions": {
26+
"Enabled": false
27+
}
28+
},
29+
"UpdateReplacePolicy": "Delete",
30+
"DeletionPolicy": "Delete"
31+
}
32+
},
33+
"Parameters": {
34+
"BootstrapVersion": {
35+
"Type": "AWS::SSM::Parameter::Value<String>",
36+
"Default": "/cdk-bootstrap/hnb659fds/version",
37+
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
38+
}
39+
},
40+
"Rules": {
41+
"CheckBootstrapVersion": {
42+
"Assertions": [
43+
{
44+
"Assert": {
45+
"Fn::Not": [
46+
{
47+
"Fn::Contains": [
48+
[
49+
"1",
50+
"2",
51+
"3",
52+
"4",
53+
"5"
54+
],
55+
{
56+
"Ref": "BootstrapVersion"
57+
}
58+
]
59+
}
60+
]
61+
},
62+
"AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
63+
}
64+
]
65+
}
66+
}
67+
}

packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.ebs.js.snapshot/cdk.out

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.ebs.js.snapshot/integ.json

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.ebs.js.snapshot/manifest.json

Lines changed: 115 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)