Merge branch 'main' into bugfix/ncl-region-failure-for-karpenterv1

Author: user1

lib/addons/karpenter/index.ts

@@ -564,7 +564,7 @@ export class KarpenterAddOn extends HelmAddOn {
     private setUpNodeRole(cluster: Cluster, stackName: string, region: string): [iam.Role, iam.CfnInstanceProfile] {
         // Set up Node Role
         const karpenterNodeRole = new iam.Role(cluster, 'karpenter-node-role', {
-            assumedBy: new iam.ServicePrincipal(`ec2.${cluster.stack.urlSuffix}`),
+            assumedBy: new iam.ServicePrincipal('ec2.amazonaws.com'),
             managedPolicies: [
                 iam.ManagedPolicy.fromAwsManagedPolicyName("AmazonEKSWorkerNodePolicy"),
                 iam.ManagedPolicy.fromAwsManagedPolicyName("AmazonEKS_CNI_Policy"),

lib/addons/karpenter/karpenter-v1.ts

@@ -360,7 +360,7 @@ export class KarpenterV1AddOn extends HelmAddOn {
     ): [iam.Role, iam.CfnInstanceProfile] {
         // Set up Node Role
         const karpenterNodeRole = new iam.Role(cluster, "karpenter-node-role", {
-            assumedBy: new iam.ServicePrincipal(`ec2.${cluster.stack.urlSuffix}`),
+            assumedBy: new iam.ServicePrincipal('ec2.amazonaws.com'),
             managedPolicies: [
                 iam.ManagedPolicy.fromAwsManagedPolicyName("AmazonEKSWorkerNodePolicy"),
                 iam.ManagedPolicy.fromAwsManagedPolicyName("AmazonEKS_CNI_Policy"),