From 6c1a19c2d54c0926c1d8098f639f3cdff6738fce Mon Sep 17 00:00:00 2001
From: Michael Fraenkel <michael.fraenkel@dominodatalab.com>
Date: Mon, 9 Jan 2023 06:55:55 -0700
Subject: [PATCH] PLAT-6117: Upgrade CDK for EKS 1.24

CDK includes https://github.com/aws/aws-cdk/pull/22945
---
 .github/workflows/tests.yml       |  2 +-
 cdk/domino_cdk/config/template.py |  2 +-
 cdk/requirements.txt              | 14 ++++++------
 cdk/setup.py                      | 36 +++++++++++++++----------------
 cdk/tests/unit/config/__init__.py |  2 +-
 5 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 6ed077cb..740149ac 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -14,7 +14,7 @@ jobs:
   test-build-deploy:
     runs-on: ubuntu-latest
     env:
-      DEPLOYER_IMAGE: quay.io/domino/deployer:develop.fd54002c320071e9133074d545843c7aac8d3e44
+      DEPLOYER_IMAGE: quay.io/domino/deployer:develop.f72b81d5db7e04cc48478d310eafa4abb927ce7f
     defaults:
       run:
         working-directory: ./cdk
diff --git a/cdk/domino_cdk/config/template.py b/cdk/domino_cdk/config/template.py
index b00f8562..d62f5c62 100644
--- a/cdk/domino_cdk/config/template.py
+++ b/cdk/domino_cdk/config/template.py
@@ -130,7 +130,7 @@ def add_nodegroups(
     )
 
     eks = EKS(
-        version="1.21",
+        version="1.24",
         private_api=private_api,
         secrets_encryption_key_arn=secrets_encryption_key_arn,
         max_nodegroup_azs=3,
diff --git a/cdk/requirements.txt b/cdk/requirements.txt
index 0daf430d..df3cb393 100644
--- a/cdk/requirements.txt
+++ b/cdk/requirements.txt
@@ -1,9 +1,9 @@
 -e .
 
-coverage~=5.5
-pytest~=6.2
-flake8~=3.9
-isort~=5.8.0
-types-requests~=2.25.0
-types-PyYAML~=5.4.1
-black~=22.3.0
+coverage~=7.0
+pytest~=7.2
+flake8~=6.0.0
+isort~=5.11.4
+types-requests~=2.28.0
+types-PyYAML~=6.0.12
+black~=22.12.0
diff --git a/cdk/setup.py b/cdk/setup.py
index 61ac73ea..a327bdd3 100644
--- a/cdk/setup.py
+++ b/cdk/setup.py
@@ -25,26 +25,26 @@
         ("domino-cdk", ["app.py", "cdk.json", "util.py"]),
     ],
     install_requires=[
-        "aws-cdk.assertions~=1.153.1",
-        "aws-cdk.aws-backup~=1.153.1",
-        "aws-cdk.aws-ec2~=1.153.1",
-        "aws-cdk.aws-ecr~=1.153.1",
-        "aws-cdk.aws-efs~=1.153.1",
-        "aws-cdk.aws-eks~=1.153.1",
-        "aws-cdk.aws-iam~=1.153.1",
-        "aws-cdk.aws-lambda~=1.153.1",
-        "aws-cdk.aws-s3~=1.153.1",
-        "aws-cdk.aws-stepfunctions-tasks~=1.153.1",
-        "aws-cdk.core~=1.153.1",
-        "aws-cdk.lambda-layer-awscli~=1.153.1",
-        "aws-cdk.lambda-layer-kubectl~=1.153.1",
-        "boto3~=1.21.0",
+        "aws-cdk.assertions~=1.187.0",
+        "aws-cdk.aws-backup~=1.187.0",
+        "aws-cdk.aws-ec2~=1.187.0",
+        "aws-cdk.aws-ecr~=1.187.0",
+        "aws-cdk.aws-efs~=1.187.0",
+        "aws-cdk.aws-eks~=1.187.0",
+        "aws-cdk.aws-iam~=1.187.0",
+        "aws-cdk.aws-lambda~=1.187.0",
+        "aws-cdk.aws-s3~=1.187.0",
+        "aws-cdk.aws-stepfunctions-tasks~=1.187.0",
+        "aws-cdk.core~=1.187.0",
+        "aws-cdk.lambda-layer-awscli~=1.187.0",
+        "aws-cdk.lambda-layer-kubectl~=1.187.0",
+        "boto3~=1.26.0",
         "field_properties~=0.1",
-        "requests~=2.25.1",
-        "ruamel.yaml~=0.17.7",
-        "semantic_version~=2.8.5",
+        "requests~=2.28.1",
+        "ruamel.yaml~=0.17.21",
+        "semantic_version~=2.10.0",
     ],
-    python_requires=">=3.6",
+    python_requires=">=3.9",
     classifiers=[
         "Development Status :: 4 - Beta",
         "Intended Audience :: Developers",
diff --git a/cdk/tests/unit/config/__init__.py b/cdk/tests/unit/config/__init__.py
index 520dc2e5..8b84d22a 100644
--- a/cdk/tests/unit/config/__init__.py
+++ b/cdk/tests/unit/config/__init__.py
@@ -59,7 +59,7 @@
     ),
     route53=Route53(zone_ids=[]),
     eks=EKS(
-        version="1.21",
+        version="1.24",
         private_api=False,
         max_nodegroup_azs=3,
         global_node_labels={'dominodatalab.com/domino-node': 'true'},