From f9601870dc07c340ee0f584f6df63ee069dca9eb Mon Sep 17 00:00:00 2001
From: shapirov <shapirov@amazon.com>
Date: Thu, 24 Oct 2024 00:13:26 -0400
Subject: [PATCH 1/2] Added ipv6-blueprint pattern and upgraded to 1.16.1,
 fixed libs

---
 bin/ipv6.ts                 |  6 ++++++
 lib/ipv6-construct/index.ts | 27 +++++++++++++++++++++++++++
 package.json                | 21 ++++++++++-----------
 3 files changed, 43 insertions(+), 11 deletions(-)
 create mode 100644 bin/ipv6.ts
 create mode 100644 lib/ipv6-construct/index.ts

diff --git a/bin/ipv6.ts b/bin/ipv6.ts
new file mode 100644
index 00000000..92d58dcf
--- /dev/null
+++ b/bin/ipv6.ts
@@ -0,0 +1,6 @@
+import { configureApp } from "../lib/common/construct-utils";
+import IpV6Construct from "../lib/ipv6-construct";
+
+const app = configureApp();
+
+new IpV6Construct().build(app, "ipv6");
diff --git a/lib/ipv6-construct/index.ts b/lib/ipv6-construct/index.ts
new file mode 100644
index 00000000..fe879e13
--- /dev/null
+++ b/lib/ipv6-construct/index.ts
@@ -0,0 +1,27 @@
+import * as cdk from 'aws-cdk-lib';
+import * as blueprints from '@aws-quickstart/eks-blueprints';
+import { Construct } from "constructs";
+import { IpFamily } from 'aws-cdk-lib/aws-eks';
+
+export default class IpV6Construct {
+    build(scope: Construct, id: string) {
+        const account = process.env.CDK_DEFAULT_ACCOUNT!;
+        const region = process.env.CDK_DEFAULT_REGION!;
+        const stackID = `${id}-blueprint`;
+
+        const ipFamily = IpFamily.IP_V6; //IpFamily.IP_V6 is equivalent to "ipv6"
+        // AddOns for the cluster. For ipv6 cluster, we haven't tested with all the addons except for the below addons.
+        const addOns: Array<blueprints.ClusterAddOn> = [
+            new blueprints.addons.VpcCniAddOn(),
+            new blueprints.addons.KarpenterAddOn(),
+            new blueprints.addons.SecretsStoreAddOn()
+        ];
+        blueprints.EksBlueprint.builder()
+            .account(account)
+            .region(region)
+            .version('auto')
+            .ipFamily(ipFamily)
+            .addOns(...addOns)
+            .build(scope, stackID);
+    }
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index 61477b12..05ad4418 100644
--- a/package.json
+++ b/package.json
@@ -13,9 +13,9 @@
   },
   "devDependencies": {
     "@types/jest": "^29.5.11",
-    "@types/node": "^20.10.5",
-    "@typescript-eslint/eslint-plugin": "^6.15.0",
-    "@typescript-eslint/parser": "^6.15.0",
+    "@types/node": "^22.7.9",
+    "@typescript-eslint/eslint-plugin": "^8.11.0",
+    "@typescript-eslint/parser": "^8.11.0",
     "copyfiles": "^2.4.1",
     "eslint": "^8.56.0",
     "jest": "^29.7.0",
@@ -24,32 +24,31 @@
     "typescript": "^5.3.3"
   },
   "dependencies": {
-    "@aws-quickstart/eks-blueprints": "1.14.1",
+    "@aws-quickstart/eks-blueprints": "file:../eks-blueprints/aws-quickstart-eks-blueprints-1.16.1.tgz",
     "@aws-sdk/client-config-service": "^3.576.0",
     "@aws-sdk/client-eks": "^3.478.0",
     "@claranet-ch/konveyor-eks-blueprint-addon": "^1.0.2",
     "@datadog/datadog-eks-blueprints-addon": "^0.1.2",
-    "@dynatrace/dynatrace-eks-blueprints-addon": "^0.0.4",
+    "@dynatrace/dynatrace-eks-blueprints-addon": "^1.3.1-1 ",
     "@granulate/gmaestro-eks-blueprints-addon": "^1.0.16",
     "@instana/aws-eks-blueprint-addon": "^1.0.4",
     "@kastenhq/kasten-eks-blueprints-addon": "^1.0.1",
     "@keptn/keptn-controlplane-eks-blueprints-addon": "^0.5.0",
     "@komodor/komodor-eks-blueprints-addon": "^1.2.0",
     "@kubecost/kubecost-eks-blueprints-addon": "^0.1.8",
-    "kubeshark":"^0.0.9",
     "@newrelic/newrelic-eks-blueprints-addon": "^1.0.9",
     "@paralus/paralus-eks-blueprints-addon": "^0.1.5",
     "@rafaysystems/rafay-eks-blueprints-addon": "^0.0.2",
     "@snyk-partners/snyk-monitor-eks-blueprints-addon": "^1.1.1",
-    "aws-cdk": "2.133.0",
-    "aws-cdk-lib": "2.133.0",
+    "aws-cdk": "2.162.1",
+    "aws-cdk-lib": "2.162.1",
     "eks-blueprints-cdk-kubeflow-ext": "0.1.9",
+    "kubeshark": "^0.0.9",
     "source-map-support": "^0.5.21"
   },
   "overrides": {
-    "@aws-quickstart/eks-blueprints": "1.14.1",
-    "aws-cdk": "2.133.0",
-    "aws-cdk-lib": "2.133.0",
+    "aws-cdk": "2.162.1",
+    "aws-cdk-lib": "2.162.1",
     "xml2js": "0.5.0",
     "@aws-cdk/core": "../_EXCLUDED_",
     "axios": "^1.6.2"

From 57927c5c40b7ffca2e281addcf3ede393b9a5f21 Mon Sep 17 00:00:00 2001
From: shapirov103 <shapirov@amazon.com>
Date: Fri, 25 Oct 2024 14:43:49 -0400
Subject: [PATCH 2/2] upgraded ti the published dependency on 1.16.1 of
 blueprints

---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 05ad4418..b9d173ea 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "typescript": "^5.3.3"
   },
   "dependencies": {
-    "@aws-quickstart/eks-blueprints": "file:../eks-blueprints/aws-quickstart-eks-blueprints-1.16.1.tgz",
+    "@aws-quickstart/eks-blueprints": "1.16.1",
     "@aws-sdk/client-config-service": "^3.576.0",
     "@aws-sdk/client-eks": "^3.478.0",
     "@claranet-ch/konveyor-eks-blueprint-addon": "^1.0.2",
@@ -47,6 +47,7 @@
     "source-map-support": "^0.5.21"
   },
   "overrides": {
+    "@aws-quickstart/eks-blueprints": "1.16.1",
     "aws-cdk": "2.162.1",
     "aws-cdk-lib": "2.162.1",
     "xml2js": "0.5.0",