fixed unit tests and upgraded CDK to 2.173.4

.devcontainer/devcontainer.json

@@ -6,7 +6,7 @@
       },
       "ghcr.io/devcontainers/features/aws-cli:1": {},
       "ghcr.io/devcontainers-contrib/features/aws-cdk:2": {
-        "version": "2.173.2"
+        "version": "2.173.4"
       }
     },
     "postCreateCommand": ".devcontainer/postCreateCommand.sh",

README.md

@@ -48,14 +48,14 @@ aws --version
 Install CDK matching the current version of the Blueprints QuickStart (which can be found in package.json).
 
 ```bash
-npm install -g [email protected].2
+npm install -g [email protected].4
 ```
 
 Verify the installation.
 
 ```bash
 cdk --version
-# must output 2.173.2
+# must output 2.173.4
 ```
 
 Create a new CDK project. We use `typescript` for this example.

docs/README.md

@@ -44,14 +44,14 @@ aws --version
 Install CDK matching the current version of the Blueprints QuickStart (which can be found in package.json).
 
 ```bash
-npm install -g [email protected].2
+npm install -g [email protected].4
 ```
 
 Verify the installation.
 
 ```bash
 cdk --version
-# must output 2.173.2
+# must output 2.173.4
 ```
 
 Create a new CDK project. We use `typescript` for this example.

docs/getting-started.md

@@ -26,8 +26,8 @@ Create a directory that represents you project (e.g. `my-blueprints`) and then c
 ```bash
 npm install -g n # may require sudo
 n stable # may require sudo 
-npm install -g [email protected].2 # may require sudo (Ubuntu) depending on configuration
-cdk --version # must produce 2.173.2
+npm install -g [email protected].4 # may require sudo (Ubuntu) depending on configuration
+cdk --version # must produce 2.173.4
 mkdir my-blueprints
 cd my-blueprints
 cdk init app --language typescript
@@ -57,7 +57,7 @@ npm ERR! peer bundled aws-cdk-lib@"2.133.0" from @aws-quickstart/eks-blueprints@
 npm ERR! node_modules/@aws-quickstart/eks-blueprint
 ```
 
-This message means that the version of CDK that the customer is using is different from the version of CDK used in EKS Blueprints. Locate the line `peer bundled` and check the expected version of the CDK. Make sure that in your `package.json` the version is set to the expected. In this example, `package.json` contained `"aws-cdk-lib": "2.133.0"`, while the expected version was `2.173.2`.
+This message means that the version of CDK that the customer is using is different from the version of CDK used in EKS Blueprints. Locate the line `peer bundled` and check the expected version of the CDK. Make sure that in your `package.json` the version is set to the expected. In this example, `package.json` contained `"aws-cdk-lib": "2.133.0"`, while the expected version was `2.173.4`.
 
 **Note**: after the initial installation, upgrading the version of CDK to an incompatible higher/lower version will produce a warning, but will succeed. For community support (submitting GitHub issues) please make sure you have a matching version configured.
 

docs/internal/ci.md

@@ -19,7 +19,7 @@ cd cdk-eks-blueprints
 Install CDK (please review and install any missing [pre-requisites](https://docs.aws.amazon.com/cdk/latest/guide/getting_started.html) for your environment)
 
 ```sh
-npm install -g [email protected].2
+npm install -g [email protected].4
 ```
 
 Install the dependencies for this project.

lib/addons/aws-loadbalancer-controller/index.ts

@@ -5,14 +5,9 @@ import { ClusterInfo, Values } from "../../spi";
 import { registries } from "../../utils/registry-utils";
 import { HelmAddOn, HelmAddOnUserProps } from "../helm-addon";
 import { AwsLoadbalancerControllerIamPolicy } from "./iam-policy";
-<<<<<<< HEAD
-import { dependable, supportsALL } from "../../utils";
-import { Duration } from "aws-cdk-lib";
-import { VpcCniAddOn } from "../vpc-cni";
-=======
 import { supportsALL } from "../../utils";
 import { Duration } from "aws-cdk-lib";
->>>>>>> main
+
 
 /**
  * Configuration options for the add-on.
@@ -92,7 +87,6 @@ export class AwsLoadBalancerControllerAddOn extends HelmAddOn {
         this.options = this.props as AwsLoadBalancerControllerProps;
     }
 
-    @dependable(VpcCniAddOn.name)
     deploy(clusterInfo: ClusterInfo): Promise<Construct> {
         const cluster = clusterInfo.cluster;
         const serviceAccount = cluster.addServiceAccount(

lib/pipelines/code-pipeline.ts

@@ -457,7 +457,7 @@ class CodePipeline {
               primaryOutputDirectory: `${path}/cdk.out`,
               installCommands: [
                 'n stable',
-                'npm install -g [email protected].2',
+                'npm install -g [email protected].4',
                 `cd $CODEBUILD_SRC_DIR/${path} && npm install`
               ],
               commands: [`cd $CODEBUILD_SRC_DIR/${path}`, 'npm run build', 'npx cdk synth ' + app]

package.json

@@ -74,7 +74,7 @@
         "semver": "^7.6.0"
     },
     "peerDependencies": {
-        "aws-cdk-lib": "2.173.2",
-        "aws-cdk": "2.173.2"
+        "aws-cdk-lib": "2.173.4",
+        "aws-cdk": "2.173.4"
     }
 }