Skip to content

[Fix] Create-VPC stack to attach subnets for EKS cluster #1875

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

Merged
merged 4 commits into from
Oct 10, 2025
Merged

[Fix] Create-VPC stack to attach subnets for EKS cluster #1875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e9ca843
fix create-vpc stack creation
jugal-chauhan Oct 9, 2025
2161e51
fix node test failures
jugal-chauhan Oct 9, 2025
5fbd4c1
address comments
jugal-chauhan Oct 9, 2025
c3010ee
Merge remote-tracking branch 'origin/main' into fix-k8s-create-vpc
jugal-chauhan Oct 9, 2025
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
2 changes: 1 addition & 1 deletion deployment/migration-assistant-solution/lib/eks-infra.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export class EKSInfra extends Construct {
});

let subnetIds
if (props.vpcSubnetIds) {
if (props.vpcSubnetIds && props.vpcSubnetIds.length > 0) {
subnetIds = props.vpcSubnetIds
} else {
subnetIds = []
Expand Down
97 changes: 96 additions & 1 deletion deployment/migration-assistant-solution/test/__snapshots__/solutions-stack-eks.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1256,7 +1256,14 @@ exports[`Solutions stack Migration stack with new VPC matches snapshot 1`] = `
},
],
},
"SubnetIds": [],
"SubnetIds": [
{
"Ref": "VpcPrivateSubnet1Subnet536B997A",
},
{
"Ref": "VpcPrivateSubnet2Subnet3788AAA1",
},
],
},
"RoleArn": {
"Fn::GetAtt": [
Expand Down Expand Up @@ -1815,6 +1822,28 @@ exports[`Solutions stack Migration stack with new VPC matches snapshot 1`] = `
],
"Properties": {
"Tags": [
{
"Key": {
"Fn::Join": [
"",
[
"kubernetes.io/cluster/migration-eks-cluster-",
{
"Ref": "Stage",
},
"-",
{
"Ref": "AWS::Region",
},
],
],
},
"Value": "shared",
},
{
"Key": "kubernetes.io/role/internal-elb",
"Value": "1",
},
{
"Key": "Name",
"Value": {
Expand Down Expand Up @@ -1883,6 +1912,28 @@ exports[`Solutions stack Migration stack with new VPC matches snapshot 1`] = `
"Key": "aws-cdk:subnet-type",
"Value": "Private",
},
{
"Key": {
"Fn::Join": [
"",
[
"kubernetes.io/cluster/migration-eks-cluster-",
{
"Ref": "Stage",
},
"-",
{
"Ref": "AWS::Region",
},
],
],
},
"Value": "shared",
},
{
"Key": "kubernetes.io/role/internal-elb",
"Value": "1",
},
{
"Key": "Name",
"Value": {
Expand Down Expand Up @@ -1940,6 +1991,28 @@ exports[`Solutions stack Migration stack with new VPC matches snapshot 1`] = `
],
"Properties": {
"Tags": [
{
"Key": {
"Fn::Join": [
"",
[
"kubernetes.io/cluster/migration-eks-cluster-",
{
"Ref": "Stage",
},
"-",
{
"Ref": "AWS::Region",
},
],
],
},
"Value": "shared",
},
{
"Key": "kubernetes.io/role/internal-elb",
"Value": "1",
},
{
"Key": "Name",
"Value": {
Expand Down Expand Up @@ -2022,6 +2095,28 @@ exports[`Solutions stack Migration stack with new VPC matches snapshot 1`] = `
"Key": "aws-cdk:subnet-type",
"Value": "Private",
},
{
"Key": {
"Fn::Join": [
"",
[
"kubernetes.io/cluster/migration-eks-cluster-",
{
"Ref": "Stage",
},
"-",
{
"Ref": "AWS::Region",
},
],
],
},
"Value": "shared",
},
{
"Key": "kubernetes.io/role/internal-elb",
"Value": "1",
},
{
"Key": "Name",
"Value": {
Expand Down