Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update cdk lib version to latest #119

Merged
merged 1 commit into from
May 16, 2024
Merged

Update cdk lib version to latest #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 10 additions & 14 deletions lib/infra/infra-stack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,14 +457,15 @@
}

if (this.singleNodeCluster) {
console.log('Single node value is true, creating single node configurations');

Check warning on line 460 in lib/infra/infra-stack.ts

View workflow job for this annotation

GitHub Actions / build 

Unexpected console statement
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,
Expand Down Expand Up @@ -512,8 +513,7 @@
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,
Expand Down Expand Up @@ -545,8 +545,7 @@
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,
Expand Down Expand Up @@ -574,8 +573,7 @@
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,
Expand Down Expand Up @@ -605,8 +603,7 @@
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,
Expand Down Expand Up @@ -637,8 +634,7 @@
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,
Expand Down
3 changes: 2 additions & 1 deletion lib/networking/vpc-stack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import { Stack, StackProps } from 'aws-cdk-lib';
import {
IpAddresses,
IPeer,
ISecurityGroup,
IVpc,
Expand Down Expand Up @@ -54,9 +55,9 @@

// VPC specs
if (vpcId === 'undefined') {
console.log('No VPC-Id Provided, a new VPC will be created');

Check warning on line 58 in lib/networking/vpc-stack.ts

View workflow job for this annotation

GitHub Actions / build 

Unexpected console statement
this.vpc = new Vpc(this, 'opensearchClusterVpc', {
cidr: cidrRange,
ipAddresses: IpAddresses.cidr(cidrRange),
maxAzs: 3,
subnetConfiguration: [
{
Expand All @@ -72,7 +73,7 @@
],
});
} else {
console.log('VPC provided, using existing');

Check warning on line 76 in lib/networking/vpc-stack.ts

View workflow job for this annotation

GitHub Actions / build 

Unexpected console statement
this.vpc = Vpc.fromLookup(this, 'opensearchClusterVpc', {
vpcId,
});
Expand Down
Loading
Loading