Skip to content

Commit 470a881

Browse files
iliapoloiliapolo
authored
fix(eks): Self managed nodes cannot be added to LoadBalancers created via the LoadBalancer service type (#12269)
Following this [PR](#12042), self managed nodes are now attached with the cluster security group. This causes the self managed nodes to have multiple security groups with the "owned" tag. This in turn causes load balancers to reject these instances since its unable to determine which security groups should be added with ingress rules to allow the load balancer to connect to the instances. The fix is to exclude tagging the dedicated ASG security group with this tag, it is no longer necessary since the cluster security group has that tag by default. Fixes #12166 This breaksge is unfortunate, but I can't see a way out of it. And it does actually fix a bug. BREAKING CHANGE: Existing self managed nodes may loose the ability to host additional services of type `LoadBalancer` . See #12269 (comment) for possible mitigations. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent 646f098 commit 470a881

File tree

4 files changed

+75
-119
lines changed

4 files changed

+75
-119
lines changed

‎packages/@aws-cdk/aws-eks/lib/cluster.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1262,8 +1262,12 @@ export class Cluster extends ClusterBase {
12621262
autoScalingGroup.role.addManagedPolicy(iam.ManagedPolicy.fromAwsManagedPolicyName('AmazonEC2ContainerRegistryReadOnly'));
12631263

12641264
// EKS Required Tags
1265+
// https://docs.aws.amazon.com/eks/latest/userguide/worker.html
12651266
Tags.of(autoScalingGroup).add(`kubernetes.io/cluster/${this.clusterName}`, 'owned', {
12661267
applyToLaunchedInstances: true,
1268+
// exclude security groups to avoid multiple "owned" security groups.
1269+
// (the cluster security group already has this tag)
1270+
excludeResourceTypes: ['AWS::EC2::SecurityGroup'],
12671271
});
12681272

12691273
// do not attempt to map the role if `kubectl` is not enabled for this

‎packages/@aws-cdk/aws-eks/test/integ.eks-cluster.expected.json‎

Lines changed: 48 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -1471,20 +1471,6 @@
14711471
}
14721472
],
14731473
"Tags": [
1474-
{
1475-
"Key": {
1476-
"Fn::Join": [
1477-
"",
1478-
[
1479-
"kubernetes.io/cluster/",
1480-
{
1481-
"Ref": "Cluster9EE0221C"
1482-
}
1483-
]
1484-
]
1485-
},
1486-
"Value": "owned"
1487-
},
14881474
{
14891475
"Key": "Name",
14901476
"Value": "aws-cdk-eks-cluster-test/Cluster/Nodes"
@@ -1796,20 +1782,6 @@
17961782
}
17971783
],
17981784
"Tags": [
1799-
{
1800-
"Key": {
1801-
"Fn::Join": [
1802-
"",
1803-
[
1804-
"kubernetes.io/cluster/",
1805-
{
1806-
"Ref": "Cluster9EE0221C"
1807-
}
1808-
]
1809-
]
1810-
},
1811-
"Value": "owned"
1812-
},
18131785
{
18141786
"Key": "Name",
18151787
"Value": "aws-cdk-eks-cluster-test/Cluster/NodesArm"
@@ -2121,20 +2093,6 @@
21212093
}
21222094
],
21232095
"Tags": [
2124-
{
2125-
"Key": {
2126-
"Fn::Join": [
2127-
"",
2128-
[
2129-
"kubernetes.io/cluster/",
2130-
{
2131-
"Ref": "Cluster9EE0221C"
2132-
}
2133-
]
2134-
]
2135-
},
2136-
"Value": "owned"
2137-
},
21382096
{
21392097
"Key": "Name",
21402098
"Value": "aws-cdk-eks-cluster-test/Cluster/BottlerocketNodes"
@@ -2460,20 +2418,6 @@
24602418
}
24612419
],
24622420
"Tags": [
2463-
{
2464-
"Key": {
2465-
"Fn::Join": [
2466-
"",
2467-
[
2468-
"kubernetes.io/cluster/",
2469-
{
2470-
"Ref": "Cluster9EE0221C"
2471-
}
2472-
]
2473-
]
2474-
},
2475-
"Value": "owned"
2476-
},
24772421
{
24782422
"Key": "Name",
24792423
"Value": "aws-cdk-eks-cluster-test/Cluster/spot"
@@ -2818,20 +2762,6 @@
28182762
}
28192763
],
28202764
"Tags": [
2821-
{
2822-
"Key": {
2823-
"Fn::Join": [
2824-
"",
2825-
[
2826-
"kubernetes.io/cluster/",
2827-
{
2828-
"Ref": "Cluster9EE0221C"
2829-
}
2830-
]
2831-
]
2832-
},
2833-
"Value": "owned"
2834-
},
28352765
{
28362766
"Key": "Name",
28372767
"Value": "aws-cdk-eks-cluster-test/Cluster/InferenceInstances"
@@ -3977,7 +3907,7 @@
39773907
},
39783908
"/",
39793909
{
3980-
"Ref": "AssetParameters5b4a9f125b1d010c96760d55e0fc56362a73e6ca6da3af20a4d13ea27e369853S3Bucket3EB15EF2"
3910+
"Ref": "AssetParameters6b9ad3782e5bfd49d7a58fc915b6151dbed2e24d824730d7720bc8237ba252c8S3Bucket0B8E3806"
39813911
},
39823912
"/",
39833913
{
@@ -3987,7 +3917,7 @@
39873917
"Fn::Split": [
39883918
"||",
39893919
{
3990-
"Ref": "AssetParameters5b4a9f125b1d010c96760d55e0fc56362a73e6ca6da3af20a4d13ea27e369853S3VersionKeyD6A244FC"
3920+
"Ref": "AssetParameters6b9ad3782e5bfd49d7a58fc915b6151dbed2e24d824730d7720bc8237ba252c8S3VersionKey862F0970"
39913921
}
39923922
]
39933923
}
@@ -4000,7 +3930,7 @@
40003930
"Fn::Split": [
40013931
"||",
40023932
{
4003-
"Ref": "AssetParameters5b4a9f125b1d010c96760d55e0fc56362a73e6ca6da3af20a4d13ea27e369853S3VersionKeyD6A244FC"
3933+
"Ref": "AssetParameters6b9ad3782e5bfd49d7a58fc915b6151dbed2e24d824730d7720bc8237ba252c8S3VersionKey862F0970"
40043934
}
40053935
]
40063936
}
@@ -4022,11 +3952,11 @@
40223952
"Arn"
40233953
]
40243954
},
4025-
"referencetoawscdkeksclustertestAssetParametersd01b2d8959358117de0017e6f18135905e5680cfc8a83e406229c02671c2b34fS3Bucket3AA74A74Ref": {
4026-
"Ref": "AssetParametersd01b2d8959358117de0017e6f18135905e5680cfc8a83e406229c02671c2b34fS3Bucket81EA5F11"
3955+
"referencetoawscdkeksclustertestAssetParametersbafd50ae9f214e496ff8c72c6425f93dca3ccd590e20963706d5d610d9c75757S3Bucket174F3576Ref": {
3956+
"Ref": "AssetParametersbafd50ae9f214e496ff8c72c6425f93dca3ccd590e20963706d5d610d9c75757S3Bucket008DBB35"
40273957
},
4028-
"referencetoawscdkeksclustertestAssetParametersd01b2d8959358117de0017e6f18135905e5680cfc8a83e406229c02671c2b34fS3VersionKey2EF124C2Ref": {
4029-
"Ref": "AssetParametersd01b2d8959358117de0017e6f18135905e5680cfc8a83e406229c02671c2b34fS3VersionKey32DED07C"
3958+
"referencetoawscdkeksclustertestAssetParametersbafd50ae9f214e496ff8c72c6425f93dca3ccd590e20963706d5d610d9c75757S3VersionKeyE8595856Ref": {
3959+
"Ref": "AssetParametersbafd50ae9f214e496ff8c72c6425f93dca3ccd590e20963706d5d610d9c75757S3VersionKey97C3E1A0"
40303960
},
40313961
"referencetoawscdkeksclustertestVpcPrivateSubnet1Subnet32A4EC2ARef": {
40323962
"Ref": "VpcPrivateSubnet1Subnet536B997A"
@@ -4043,17 +3973,17 @@
40433973
"ClusterSecurityGroupId"
40443974
]
40453975
},
4046-
"referencetoawscdkeksclustertestAssetParametersefd72738f046105c96299fb31b3da40320e71ee9cf74bc37720042898403e2a1S3Bucket69155862Ref": {
4047-
"Ref": "AssetParametersefd72738f046105c96299fb31b3da40320e71ee9cf74bc37720042898403e2a1S3Bucket6DACDE73"
3976+
"referencetoawscdkeksclustertestAssetParameterse9882ab123687399f934da0d45effe675ecc8ce13b40cb946f3e1d6141fe8d68S3BucketB4E9C142Ref": {
3977+
"Ref": "AssetParameterse9882ab123687399f934da0d45effe675ecc8ce13b40cb946f3e1d6141fe8d68S3BucketAEADE8C7"
40483978
},
4049-
"referencetoawscdkeksclustertestAssetParametersefd72738f046105c96299fb31b3da40320e71ee9cf74bc37720042898403e2a1S3VersionKey0A6CC98ARef": {
4050-
"Ref": "AssetParametersefd72738f046105c96299fb31b3da40320e71ee9cf74bc37720042898403e2a1S3VersionKey015AEA61"
3979+
"referencetoawscdkeksclustertestAssetParameterse9882ab123687399f934da0d45effe675ecc8ce13b40cb946f3e1d6141fe8d68S3VersionKey1C7C1F5FRef": {
3980+
"Ref": "AssetParameterse9882ab123687399f934da0d45effe675ecc8ce13b40cb946f3e1d6141fe8d68S3VersionKeyE415415F"
40513981
},
4052-
"referencetoawscdkeksclustertestAssetParametersb61858bbf1a0be803552e3efa9647befd728156696dff1b413b7b2fd4da1449fS3BucketDD492793Ref": {
4053-
"Ref": "AssetParametersb61858bbf1a0be803552e3efa9647befd728156696dff1b413b7b2fd4da1449fS3Bucket7EE7EA15"
3982+
"referencetoawscdkeksclustertestAssetParameters844c1a4b13479b359ea0e607dccb4a04b73e22cf88cf9b64feed2c5f0de213c0S3Bucket8834EE90Ref": {
3983+
"Ref": "AssetParameters844c1a4b13479b359ea0e607dccb4a04b73e22cf88cf9b64feed2c5f0de213c0S3Bucket6ABE1927"
40543984
},
4055-
"referencetoawscdkeksclustertestAssetParametersb61858bbf1a0be803552e3efa9647befd728156696dff1b413b7b2fd4da1449fS3VersionKeyD869415CRef": {
4056-
"Ref": "AssetParametersb61858bbf1a0be803552e3efa9647befd728156696dff1b413b7b2fd4da1449fS3VersionKey6C948E78"
3985+
"referencetoawscdkeksclustertestAssetParameters844c1a4b13479b359ea0e607dccb4a04b73e22cf88cf9b64feed2c5f0de213c0S3VersionKey1CADE360Ref": {
3986+
"Ref": "AssetParameters844c1a4b13479b359ea0e607dccb4a04b73e22cf88cf9b64feed2c5f0de213c0S3VersionKeyF55A2EA9"
40573987
},
40583988
"referencetoawscdkeksclustertestVpc9A302ADDRef": {
40593989
"Ref": "Vpc8378EB38"
@@ -4381,7 +4311,7 @@
43814311
"Properties": {
43824312
"Code": {
43834313
"S3Bucket": {
4384-
"Ref": "AssetParameters2acc31b34c05692ab3ea9831a27e5f241cffb21857e633d8256b8f0ebf5f3f43S3BucketB43AFE04"
4314+
"Ref": "AssetParameters5f49893093e1ad14831626016699156d48da5f0890f19eb930bc3c46cf5f636dS3BucketA6642550"
43854315
},
43864316
"S3Key": {
43874317
"Fn::Join": [
@@ -4394,7 +4324,7 @@
43944324
"Fn::Split": [
43954325
"||",
43964326
{
4397-
"Ref": "AssetParameters2acc31b34c05692ab3ea9831a27e5f241cffb21857e633d8256b8f0ebf5f3f43S3VersionKeyD4B858BC"
4327+
"Ref": "AssetParameters5f49893093e1ad14831626016699156d48da5f0890f19eb930bc3c46cf5f636dS3VersionKeyFEC50F65"
43984328
}
43994329
]
44004330
}
@@ -4407,7 +4337,7 @@
44074337
"Fn::Split": [
44084338
"||",
44094339
{
4410-
"Ref": "AssetParameters2acc31b34c05692ab3ea9831a27e5f241cffb21857e633d8256b8f0ebf5f3f43S3VersionKeyD4B858BC"
4340+
"Ref": "AssetParameters5f49893093e1ad14831626016699156d48da5f0890f19eb930bc3c46cf5f636dS3VersionKeyFEC50F65"
44114341
}
44124342
]
44134343
}
@@ -4725,41 +4655,41 @@
47254655
"Type": "String",
47264656
"Description": "Artifact hash for asset \"daeb79e3cee39c9b902dc0d5c780223e227ed573ea60976252947adab5fb2be1\""
47274657
},
4728-
"AssetParametersd01b2d8959358117de0017e6f18135905e5680cfc8a83e406229c02671c2b34fS3Bucket81EA5F11": {
4658+
"AssetParametersbafd50ae9f214e496ff8c72c6425f93dca3ccd590e20963706d5d610d9c75757S3Bucket008DBB35": {
47294659
"Type": "String",
4730-
"Description": "S3 bucket for asset \"d01b2d8959358117de0017e6f18135905e5680cfc8a83e406229c02671c2b34f\""
4660+
"Description": "S3 bucket for asset \"bafd50ae9f214e496ff8c72c6425f93dca3ccd590e20963706d5d610d9c75757\""
47314661
},
4732-
"AssetParametersd01b2d8959358117de0017e6f18135905e5680cfc8a83e406229c02671c2b34fS3VersionKey32DED07C": {
4662+
"AssetParametersbafd50ae9f214e496ff8c72c6425f93dca3ccd590e20963706d5d610d9c75757S3VersionKey97C3E1A0": {
47334663
"Type": "String",
4734-
"Description": "S3 key for asset version \"d01b2d8959358117de0017e6f18135905e5680cfc8a83e406229c02671c2b34f\""
4664+
"Description": "S3 key for asset version \"bafd50ae9f214e496ff8c72c6425f93dca3ccd590e20963706d5d610d9c75757\""
47354665
},
4736-
"AssetParametersd01b2d8959358117de0017e6f18135905e5680cfc8a83e406229c02671c2b34fArtifactHashE68669BA": {
4666+
"AssetParametersbafd50ae9f214e496ff8c72c6425f93dca3ccd590e20963706d5d610d9c75757ArtifactHashF584A7D8": {
47374667
"Type": "String",
4738-
"Description": "Artifact hash for asset \"d01b2d8959358117de0017e6f18135905e5680cfc8a83e406229c02671c2b34f\""
4668+
"Description": "Artifact hash for asset \"bafd50ae9f214e496ff8c72c6425f93dca3ccd590e20963706d5d610d9c75757\""
47394669
},
4740-
"AssetParametersefd72738f046105c96299fb31b3da40320e71ee9cf74bc37720042898403e2a1S3Bucket6DACDE73": {
4670+
"AssetParameterse9882ab123687399f934da0d45effe675ecc8ce13b40cb946f3e1d6141fe8d68S3BucketAEADE8C7": {
47414671
"Type": "String",
4742-
"Description": "S3 bucket for asset \"efd72738f046105c96299fb31b3da40320e71ee9cf74bc37720042898403e2a1\""
4672+
"Description": "S3 bucket for asset \"e9882ab123687399f934da0d45effe675ecc8ce13b40cb946f3e1d6141fe8d68\""
47434673
},
4744-
"AssetParametersefd72738f046105c96299fb31b3da40320e71ee9cf74bc37720042898403e2a1S3VersionKey015AEA61": {
4674+
"AssetParameterse9882ab123687399f934da0d45effe675ecc8ce13b40cb946f3e1d6141fe8d68S3VersionKeyE415415F": {
47454675
"Type": "String",
4746-
"Description": "S3 key for asset version \"efd72738f046105c96299fb31b3da40320e71ee9cf74bc37720042898403e2a1\""
4676+
"Description": "S3 key for asset version \"e9882ab123687399f934da0d45effe675ecc8ce13b40cb946f3e1d6141fe8d68\""
47474677
},
4748-
"AssetParametersefd72738f046105c96299fb31b3da40320e71ee9cf74bc37720042898403e2a1ArtifactHashC9FD06BA": {
4678+
"AssetParameterse9882ab123687399f934da0d45effe675ecc8ce13b40cb946f3e1d6141fe8d68ArtifactHashD9A515C3": {
47494679
"Type": "String",
4750-
"Description": "Artifact hash for asset \"efd72738f046105c96299fb31b3da40320e71ee9cf74bc37720042898403e2a1\""
4680+
"Description": "Artifact hash for asset \"e9882ab123687399f934da0d45effe675ecc8ce13b40cb946f3e1d6141fe8d68\""
47514681
},
4752-
"AssetParametersb61858bbf1a0be803552e3efa9647befd728156696dff1b413b7b2fd4da1449fS3Bucket7EE7EA15": {
4682+
"AssetParameters844c1a4b13479b359ea0e607dccb4a04b73e22cf88cf9b64feed2c5f0de213c0S3Bucket6ABE1927": {
47534683
"Type": "String",
4754-
"Description": "S3 bucket for asset \"b61858bbf1a0be803552e3efa9647befd728156696dff1b413b7b2fd4da1449f\""
4684+
"Description": "S3 bucket for asset \"844c1a4b13479b359ea0e607dccb4a04b73e22cf88cf9b64feed2c5f0de213c0\""
47554685
},
4756-
"AssetParametersb61858bbf1a0be803552e3efa9647befd728156696dff1b413b7b2fd4da1449fS3VersionKey6C948E78": {
4686+
"AssetParameters844c1a4b13479b359ea0e607dccb4a04b73e22cf88cf9b64feed2c5f0de213c0S3VersionKeyF55A2EA9": {
47574687
"Type": "String",
4758-
"Description": "S3 key for asset version \"b61858bbf1a0be803552e3efa9647befd728156696dff1b413b7b2fd4da1449f\""
4688+
"Description": "S3 key for asset version \"844c1a4b13479b359ea0e607dccb4a04b73e22cf88cf9b64feed2c5f0de213c0\""
47594689
},
4760-
"AssetParametersb61858bbf1a0be803552e3efa9647befd728156696dff1b413b7b2fd4da1449fArtifactHash7E705796": {
4690+
"AssetParameters844c1a4b13479b359ea0e607dccb4a04b73e22cf88cf9b64feed2c5f0de213c0ArtifactHash1D7A2D6E": {
47614691
"Type": "String",
4762-
"Description": "Artifact hash for asset \"b61858bbf1a0be803552e3efa9647befd728156696dff1b413b7b2fd4da1449f\""
4692+
"Description": "Artifact hash for asset \"844c1a4b13479b359ea0e607dccb4a04b73e22cf88cf9b64feed2c5f0de213c0\""
47634693
},
47644694
"AssetParametersb075459e6bf309093fbd4b9a9e576a5f172b91c14d84eedb0f069566f6abb0deS3Bucket14156880": {
47654695
"Type": "String",
@@ -4785,17 +4715,17 @@
47854715
"Type": "String",
47864716
"Description": "Artifact hash for asset \"952bd1c03e8201c4c1c67d6de0f3fdaaf88fda05f89a1232c3f6364343cd5344\""
47874717
},
4788-
"AssetParameters2acc31b34c05692ab3ea9831a27e5f241cffb21857e633d8256b8f0ebf5f3f43S3BucketB43AFE04": {
4718+
"AssetParameters5f49893093e1ad14831626016699156d48da5f0890f19eb930bc3c46cf5f636dS3BucketA6642550": {
47894719
"Type": "String",
4790-
"Description": "S3 bucket for asset \"2acc31b34c05692ab3ea9831a27e5f241cffb21857e633d8256b8f0ebf5f3f43\""
4720+
"Description": "S3 bucket for asset \"5f49893093e1ad14831626016699156d48da5f0890f19eb930bc3c46cf5f636d\""
47914721
},
4792-
"AssetParameters2acc31b34c05692ab3ea9831a27e5f241cffb21857e633d8256b8f0ebf5f3f43S3VersionKeyD4B858BC": {
4722+
"AssetParameters5f49893093e1ad14831626016699156d48da5f0890f19eb930bc3c46cf5f636dS3VersionKeyFEC50F65": {
47934723
"Type": "String",
4794-
"Description": "S3 key for asset version \"2acc31b34c05692ab3ea9831a27e5f241cffb21857e633d8256b8f0ebf5f3f43\""
4724+
"Description": "S3 key for asset version \"5f49893093e1ad14831626016699156d48da5f0890f19eb930bc3c46cf5f636d\""
47954725
},
4796-
"AssetParameters2acc31b34c05692ab3ea9831a27e5f241cffb21857e633d8256b8f0ebf5f3f43ArtifactHashC3527E8B": {
4726+
"AssetParameters5f49893093e1ad14831626016699156d48da5f0890f19eb930bc3c46cf5f636dArtifactHashBEC87846": {
47974727
"Type": "String",
4798-
"Description": "Artifact hash for asset \"2acc31b34c05692ab3ea9831a27e5f241cffb21857e633d8256b8f0ebf5f3f43\""
4728+
"Description": "Artifact hash for asset \"5f49893093e1ad14831626016699156d48da5f0890f19eb930bc3c46cf5f636d\""
47994729
},
48004730
"AssetParametersa69aadbed84d554dd9f2eb7987ffe5d8f76b53a86f1909059df07050e57bef0cS3Bucket1CB7A187": {
48014731
"Type": "String",
@@ -4809,17 +4739,17 @@
48094739
"Type": "String",
48104740
"Description": "Artifact hash for asset \"a69aadbed84d554dd9f2eb7987ffe5d8f76b53a86f1909059df07050e57bef0c\""
48114741
},
4812-
"AssetParameters5b4a9f125b1d010c96760d55e0fc56362a73e6ca6da3af20a4d13ea27e369853S3Bucket3EB15EF2": {
4742+
"AssetParameters6b9ad3782e5bfd49d7a58fc915b6151dbed2e24d824730d7720bc8237ba252c8S3Bucket0B8E3806": {
48134743
"Type": "String",
4814-
"Description": "S3 bucket for asset \"5b4a9f125b1d010c96760d55e0fc56362a73e6ca6da3af20a4d13ea27e369853\""
4744+
"Description": "S3 bucket for asset \"6b9ad3782e5bfd49d7a58fc915b6151dbed2e24d824730d7720bc8237ba252c8\""
48154745
},
4816-
"AssetParameters5b4a9f125b1d010c96760d55e0fc56362a73e6ca6da3af20a4d13ea27e369853S3VersionKeyD6A244FC": {
4746+
"AssetParameters6b9ad3782e5bfd49d7a58fc915b6151dbed2e24d824730d7720bc8237ba252c8S3VersionKey862F0970": {
48174747
"Type": "String",
4818-
"Description": "S3 key for asset version \"5b4a9f125b1d010c96760d55e0fc56362a73e6ca6da3af20a4d13ea27e369853\""
4748+
"Description": "S3 key for asset version \"6b9ad3782e5bfd49d7a58fc915b6151dbed2e24d824730d7720bc8237ba252c8\""
48194749
},
4820-
"AssetParameters5b4a9f125b1d010c96760d55e0fc56362a73e6ca6da3af20a4d13ea27e369853ArtifactHashD763BE57": {
4750+
"AssetParameters6b9ad3782e5bfd49d7a58fc915b6151dbed2e24d824730d7720bc8237ba252c8ArtifactHashAAFBAA4D": {
48214751
"Type": "String",
4822-
"Description": "Artifact hash for asset \"5b4a9f125b1d010c96760d55e0fc56362a73e6ca6da3af20a4d13ea27e369853\""
4752+
"Description": "Artifact hash for asset \"6b9ad3782e5bfd49d7a58fc915b6151dbed2e24d824730d7720bc8237ba252c8\""
48234753
},
48244754
"SsmParameterValueawsserviceeksoptimizedami118amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": {
48254755
"Type": "AWS::SSM::Parameter::Value<String>",

‎packages/@aws-cdk/aws-eks/test/pinger/function/index.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ def handler(event, context):
2020
# be functioning
2121
response = http.request('GET', url, retries=urllib3.Retry(10, backoff_factor=1))
2222
if response.status != 200:
23-
raise RuntimeError(f'Request failed: {status} ({response.reason})')
23+
raise RuntimeError(f'Request failed: {response.status} ({response.reason})')
2424
return {'Data': {'Value': response.data.decode('utf-8')}}

‎packages/@aws-cdk/aws-eks/test/test.cluster.ts‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,28 @@ export = {
138138

139139
},
140140

141+
'security group of self-managed asg is not tagged with owned'(test: Test) {
142+
143+
// GIVEN
144+
const { stack, vpc } = testFixture();
145+
const cluster = new eks.Cluster(stack, 'Cluster', {
146+
vpc,
147+
version: CLUSTER_VERSION,
148+
});
149+
150+
// WHEN
151+
cluster.addAutoScalingGroupCapacity('self-managed', {
152+
instanceType: new ec2.InstanceType('t2.medium'),
153+
});
154+
155+
// make sure the "kubernetes.io/cluster/<CLUSTER_NAME>: owned" tag isn't here.
156+
test.deepEqual(expect(stack).value.Resources.ClusterselfmanagedInstanceSecurityGroup64468C3A.Properties.Tags, [
157+
{ Key: 'Name', Value: 'Stack/Cluster/self-managed' },
158+
]);
159+
test.done();
160+
161+
},
162+
141163
'cluster security group is attached when connecting self-managed nodes'(test: Test) {
142164

143165
// GIVEN

0 commit comments

Comments
 (0)