aws-samples · rddefauw · Oct 31, 2022 · Nov 16, 2022 · pdifranc · Nov 17, 2022
diff --git a/.gitignore b/.gitignore
@@ -127,3 +127,5 @@ dmypy.json
 deploy/
 test/
 **/.DS_Store
+
+cdk.out
diff --git a/app.py b/app.py
@@ -78,7 +78,10 @@ def __init__(self, scope: Construct, id: str, **kwargs) -> None:
         # Creates a security group for AWS RDS
         sg_rds = ec2.SecurityGroup(scope=self, id='SGRDS', vpc=vpc, security_group_name='sg_rds')
         # Adds an ingress rule which allows resources in the VPC's CIDR to access the database.
-        sg_rds.add_ingress_rule(peer=ec2.Peer.ipv4('10.0.0.0/24'), connection=ec2.Port.tcp(port))
+        sg_rds.add_ingress_rule(
+            peer=ec2.Peer.ipv4(vpc.vpc_cidr_block),
+            connection=ec2.Port.tcp(port)
+        )
 
         database = rds.DatabaseInstance(
             scope=self,
@@ -130,7 +133,8 @@ def __init__(self, scope: Construct, id: str, **kwargs) -> None:
             id='MLFLOW',
             service_name=service_name,
             cluster=cluster,
-            task_definition=task_definition
+            task_definition=task_definition,
+            public_load_balancer=False
         )
 
         # Setup security group
@@ -148,10 +152,27 @@ def __init__(self, scope: Construct, id: str, **kwargs) -> None:
             scale_in_cooldown=Duration.seconds(60),
             scale_out_cooldown=Duration.seconds(60)
         )
+
+        # ==================================================
+        # =================== JUMP HOST ======================
+        # ==================================================
+        jump = ec2.Instance(self, "JumpHost",
+            vpc=vpc,
+            instance_type=ec2.InstanceType.of(ec2.InstanceClass.M5, ec2.InstanceSize.LARGE),
+            machine_image=ec2.AmazonLinuxImage(
+                generation=ec2.AmazonLinuxGeneration.AMAZON_LINUX_2
+            ),
+            block_devices=[ec2.BlockDevice(
+                device_name= '/dev/xvda',
+                volume=ec2.BlockDeviceVolume.ebs(50)
+            )]
+        )
+
         # ==================================================
         # =================== OUTPUTS ======================
         # ==================================================
         CfnOutput(scope=self, id='LoadBalancerDNS', value=fargate_service.load_balancer.load_balancer_dns_name)
+        CfnOutput(scope=self, id='JumpHostInstanceID', value=jump.instance_id)
 
 
 app = App()

diff --git a/container/Dockerfile b/container/Dockerfile
@@ -1,7 +1,7 @@
 FROM python:3.8.0
 
 RUN pip install \
-    mlflow==1.28.0 \
+    mlflow==2.0.1 \
     pymysql==1.0.2 \
     boto3 && \
     mkdir /mlflow/

diff --git a/lab/3_deploy_model.ipynb b/lab/3_deploy_model.ipynb
@@ -20,7 +20,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "!pip install -q mlflow==1.28.0"
+    "!pip install -q mlflow==1.30.0"
    ]
   },
   {

diff --git a/lab/source_dir/requirements.txt b/lab/source_dir/requirements.txt
@@ -1 +1 @@
-mlflow==1.28.0
+mlflow==1.30.0
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,2 @@
-aws-cdk-lib==2.8.0
+aws-cdk-lib==2.47.0
 constructs==10.0.34
-Original file line number
+Diff line change
@@ Expand Up / @@ -127,3 +127,5 @@ dmypy.json @@
     deploy/
     test/
     **/.DS_Store
+    cdk.out
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		mlflow==1.28.0
		mlflow==1.30.0
Copy link pdifranc Nov 17, 2022 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Same as above there is version mismatch between the client SDK and the tracking server Copy link pdifranc Nov 17, 2022 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. side note: mlflow `2.0.1` requires python >= `3.8`. The SKLearn image from SageMaker runs on python `3.7` which will make the install fail :( Copy link pdifranc Nov 17, 2022 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. you can update the `SKLearn` framework to `framework_version='1.0-1',` and it should work. I am testing it currently Copy link pdifranc Nov 17, 2022 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. ok, is a little more complicated, since there has been a major change in how MLFlow now deploys to SageMaker, so upgrading the SDK client requires more work