Update cdk lib version to latest

Signed-off-by: Rishabh Singh <sngri@amazon.com>
opensearch-project · May 16, 2024 · fc9bd88 · fc9bd88
1 parent c7de4b4
commit fc9bd88
Show file tree

Hide file tree

Showing 4 changed files with 2,519 additions and 1,377 deletions.
diff --git a/lib/infra/infra-stack.ts b/lib/infra/infra-stack.ts
@@ -461,10 +461,11 @@ export class InfraStack extends Stack {
       singleNodeInstance = new Instance(this, 'single-node-instance', {
         vpc: props.vpc,
         instanceType: singleNodeInstanceType,
-        machineImage: MachineImage.latestAmazonLinux({
-          generation: AmazonLinuxGeneration.AMAZON_LINUX_2,
-          cpuType: instanceCpuType,
-        }),
+        machineImage: MachineImage.latestAmazonLinux2023(
+          {
+            cpuType: instanceCpuType,
+          },
+        ),
         role: this.instanceRole,
         vpcSubnets: {
           subnetType: SubnetType.PRIVATE_WITH_EGRESS,
@@ -512,8 +513,7 @@ export class InfraStack extends Stack {
         const managerNodeAsg = new AutoScalingGroup(this, 'managerNodeAsg', {
           vpc: props.vpc,
           instanceType: defaultInstanceType,
-          machineImage: MachineImage.latestAmazonLinux({
-            generation: AmazonLinuxGeneration.AMAZON_LINUX_2,
+          machineImage: MachineImage.latestAmazonLinux2023({
             cpuType: instanceCpuType,
           }),
           role: this.instanceRole,
@@ -545,8 +545,7 @@ export class InfraStack extends Stack {
       const seedNodeAsg = new AutoScalingGroup(this, 'seedNodeAsg', {
         vpc: props.vpc,
         instanceType: (seedConfig === 'seed-manager') ? defaultInstanceType : this.dataInstanceType,
-        machineImage: MachineImage.latestAmazonLinux({
-          generation: AmazonLinuxGeneration.AMAZON_LINUX_2,
+        machineImage: MachineImage.latestAmazonLinux2023({
           cpuType: instanceCpuType,
         }),
         role: this.instanceRole,
@@ -574,8 +573,7 @@ export class InfraStack extends Stack {
       const dataNodeAsg = new AutoScalingGroup(this, 'dataNodeAsg', {
         vpc: props.vpc,
         instanceType: this.dataInstanceType,
-        machineImage: MachineImage.latestAmazonLinux({
-          generation: AmazonLinuxGeneration.AMAZON_LINUX_2,
+        machineImage: MachineImage.latestAmazonLinux2023({
           cpuType: instanceCpuType,
         }),
         role: this.instanceRole,
@@ -605,8 +603,7 @@ export class InfraStack extends Stack {
         clientNodeAsg = new AutoScalingGroup(this, 'clientNodeAsg', {
           vpc: props.vpc,
           instanceType: defaultInstanceType,
-          machineImage: MachineImage.latestAmazonLinux({
-            generation: AmazonLinuxGeneration.AMAZON_LINUX_2,
+          machineImage: MachineImage.latestAmazonLinux2023({
             cpuType: instanceCpuType,
           }),
           role: this.instanceRole,
@@ -637,8 +634,7 @@ export class InfraStack extends Stack {
         const mlNodeAsg = new AutoScalingGroup(this, 'mlNodeAsg', {
           vpc: props.vpc,
           instanceType: this.mlInstanceType,
-          machineImage: MachineImage.latestAmazonLinux({
-            generation: AmazonLinuxGeneration.AMAZON_LINUX_2,
+          machineImage: MachineImage.latestAmazonLinux2023({
             cpuType: instanceCpuType,
           }),
           role: this.instanceRole,

diff --git a/lib/networking/vpc-stack.ts b/lib/networking/vpc-stack.ts
@@ -7,6 +7,7 @@ compatible open source license. */
 
 import { Stack, StackProps } from 'aws-cdk-lib';
 import {
+  IpAddresses,
   IPeer,
   ISecurityGroup,
   IVpc,
@@ -56,7 +57,7 @@ export class NetworkStack extends Stack {
     if (vpcId === 'undefined') {
       console.log('No VPC-Id Provided, a new VPC will be created');
       this.vpc = new Vpc(this, 'opensearchClusterVpc', {
-        cidr: cidrRange,
+        ipAddresses: IpAddresses.cidr(cidrRange),
         maxAzs: 3,
         subnetConfiguration: [
           {