awslabs · jagpk · Jun 25, 2021 · Jun 25, 2021 · Jun 29, 2021
diff --git a/...instances_with_eks/introduction/_index.md → ...ances_with_eks/005_introduction/_index.md b/...instances_with_eks/introduction/_index.md → ...ances_with_eks/005_introduction/_index.md
diff --git a/...h_eks/introduction/architecture/_index.md → ...s/005_introduction/architecture/_index.md b/...h_eks/introduction/architecture/_index.md → ...s/005_introduction/architecture/_index.md
diff --git a/...tion/architecture/architecture_control.md → ...tion/architecture/architecture_control.md b/...tion/architecture/architecture_control.md → ...tion/architecture/architecture_control.md
diff --git a/...architecture_control_and_data_overview.md → ...architecture_control_and_data_overview.md b/...architecture_control_and_data_overview.md → ...architecture_control_and_data_overview.md
diff --git a/...ction/architecture/architecture_worker.md → ...ction/architecture/architecture_worker.md b/...ction/architecture/architecture_worker.md → ...ction/architecture/architecture_worker.md
diff --git a/...ion/architecture/cluster_setup_options.md → ...ion/architecture/cluster_setup_options.md b/...ion/architecture/cluster_setup_options.md → ...ion/architecture/cluster_setup_options.md
diff --git a/...es_with_eks/introduction/basics/_index.md → ...ith_eks/005_introduction/basics/_index.md b/...es_with_eks/introduction/basics/_index.md → ...ith_eks/005_introduction/basics/_index.md
diff --git a/...eks/introduction/basics/concepts_nodes.md → ...005_introduction/basics/concepts_nodes.md b/...eks/introduction/basics/concepts_nodes.md → ...005_introduction/basics/concepts_nodes.md
diff --git a/...s/introduction/basics/concepts_objects.md → ...5_introduction/basics/concepts_objects.md b/...s/introduction/basics/concepts_objects.md → ...5_introduction/basics/concepts_objects.md
diff --git a/...tion/basics/concepts_objects_details_1.md → ...tion/basics/concepts_objects_details_1.md b/...tion/basics/concepts_objects_details_1.md → ...tion/basics/concepts_objects_details_1.md
diff --git a/...tion/basics/concepts_objects_details_2.md → ...tion/basics/concepts_objects_details_2.md b/...tion/basics/concepts_objects_details_2.md → ...tion/basics/concepts_objects_details_2.md
diff --git a/...th_eks/introduction/basics/what_is_k8s.md → ...ks/005_introduction/basics/what_is_k8s.md b/...th_eks/introduction/basics/what_is_k8s.md → ...ks/005_introduction/basics/what_is_k8s.md
diff --git a/...ances_with_eks/introduction/eks/_index.md → ...s_with_eks/005_introduction/eks/_index.md b/...ances_with_eks/introduction/eks/_index.md → ...s_with_eks/005_introduction/eks/_index.md
diff --git a/...eks/introduction/eks/eks_control_plane.md → ...005_introduction/eks/eks_control_plane.md b/...eks/introduction/eks/eks_control_plane.md → ...005_introduction/eks/eks_control_plane.md
diff --git a/...ith_eks/introduction/eks/eks_customers.md → ...eks/005_introduction/eks/eks_customers.md b/...ith_eks/introduction/eks/eks_customers.md → ...eks/005_introduction/eks/eks_customers.md
diff --git a/...introduction/eks/eks_high_architecture.md → ...introduction/eks/eks_high_architecture.md b/...introduction/eks/eks_high_architecture.md → ...introduction/eks/eks_high_architecture.md
diff --git a/...th_eks/introduction/eks/eks_high_level.md → ...ks/005_introduction/eks/eks_high_level.md b/...th_eks/introduction/eks/eks_high_level.md → ...ks/005_introduction/eks/eks_high_level.md
diff --git a/...nstances_with_eks/prerequisites/_index.md → ...nces_with_eks/010_prerequisites/_index.md b/...nstances_with_eks/prerequisites/_index.md → ...nces_with_eks/010_prerequisites/_index.md
@@ -7,7 +7,7 @@ weight: 10
 # Getting Started
 To start the workshop, follow one of the following depending on whether you are...
 
-* ...[running the workshop on your own (in your own account)]({{< ref "/using_ec2_spot_instances_with_eks/prerequisites/self_paced.md" >}}), or
-* ...[attending an AWS hosted event (using AWS provided hashes)]({{< ref "/using_ec2_spot_instances_with_eks/prerequisites/aws_event.md" >}})
+* ...[running the workshop on your own (in your own account)]({{< ref "/using_ec2_spot_instances_with_eks/010_prerequisites/self_paced.md" >}}), or
+* ...[attending an AWS hosted event (using AWS provided hashes)]({{< ref "/using_ec2_spot_instances_with_eks/010_prerequisites/aws_event.md" >}})
 
-Once you have completed with either setup, continue with **[Create a Workspace]({{< ref "/using_ec2_spot_instances_with_eks/prerequisites/workspace.md" >}})**
+Once you have completed with either setup, continue with **[Create a Workspace]({{< ref "/using_ec2_spot_instances_with_eks/010_prerequisites/workspace.md" >}})**
diff --git a/..._with_eks/prerequisites/ap-southeast-1.md → ...h_eks/010_prerequisites/ap-southeast-1.md b/..._with_eks/prerequisites/ap-southeast-1.md → ...h_eks/010_prerequisites/ap-southeast-1.md
diff --git a/..._eks/prerequisites/at_an_aws_updateiam.md → .../010_prerequisites/at_an_aws_updateiam.md b/..._eks/prerequisites/at_an_aws_updateiam.md → .../010_prerequisites/at_an_aws_updateiam.md
diff --git a/...s/prerequisites/at_an_aws_validaterole.md → ...0_prerequisites/at_an_aws_validaterole.md b/...s/prerequisites/at_an_aws_validaterole.md → ...0_prerequisites/at_an_aws_validaterole.md
diff --git a/..._eks/prerequisites/attach_workspaceiam.md → .../010_prerequisites/attach_workspaceiam.md b/..._eks/prerequisites/attach_workspaceiam.md → .../010_prerequisites/attach_workspaceiam.md
diff --git a/...ances_with_eks/prerequisites/aws_event.md → ...s_with_eks/010_prerequisites/aws_event.md b/...ances_with_eks/prerequisites/aws_event.md → ...s_with_eks/010_prerequisites/aws_event.md
@@ -9,7 +9,7 @@ weight: 20
 {{% notice warning %}}
 Only complete this section if you are at an AWS hosted event (such as re:Invent,
 Kubecon, Immersion Day, or any other event hosted by an AWS employee). If you 
-are running the workshop on your own, go to: [Start the workshop on your own]({{< ref "/using_ec2_spot_instances_with_eks/prerequisites/self_paced.md" >}}).
+are running the workshop on your own, go to: [Start the workshop on your own]({{< ref "/using_ec2_spot_instances_with_eks/010_prerequisites/self_paced.md" >}}).
 {{% /notice %}}
 
 ### Login to the AWS Workshop Portal
@@ -42,7 +42,7 @@ We have deployed the below resources required to get started with the workshop u
 
 + An EKS cluster with the name `eksworkshop-eksctl` and a [EKS managed node group](https://docs.aws.amazon.com/eks/latest/userguide/managed-node-groups.html)  with 2 on-demand instances.
 
-{{% insert-md-from-file file="using_ec2_spot_instances_with_eks/eksctl/create_eks_cluster_eksctl_command.md" %}}
+{{% insert-md-from-file file="using_ec2_spot_instances_with_eks/020_eksctl/create_eks_cluster_eksctl_command.md" %}}
 
 
 #### Use your resources 
@@ -53,7 +53,7 @@ In this workshop, you'll need to reference the resources created by the CloudFor
 
 1. In the stack details pane, click the **Outputs** tab.
 
-![cnf_output](/images/using_ec2_spot_instances_with_eks/prerequisites/cnf_output.png)
+![cnf_output](/images/using_ec2_spot_instances_with_eks/010_prerequisites/cnf_output.png)
 
 It is recommended that you keep this window open so you can easily refer to the outputs and resources throughout the workshop.
 
@@ -65,9 +65,9 @@ you will notice additional Cloudformation stacks were also deployed which is the
 
 - Click on the url against `Cloud9IDE` from the outputs
 
-{{% insert-md-from-file file="using_ec2_spot_instances_with_eks/prerequisites/workspace_at_launch.md" %}}
+{{% insert-md-from-file file="using_ec2_spot_instances_with_eks/010_prerequisites/workspace_at_launch.md" %}}
 
-{{% insert-md-from-file file="using_ec2_spot_instances_with_eks/prerequisites/update_workspace_settings.md" %}}
+{{% insert-md-from-file file="using_ec2_spot_instances_with_eks/010_prerequisites/update_workspace_settings.md" %}}
 
 ### Validate the IAM role {#validate_iam}
 
@@ -78,10 +78,10 @@ aws sts get-caller-identity
 
 ```
 
-{{% insert-md-from-file file="using_ec2_spot_instances_with_eks/prerequisites/at_an_aws_validaterole.md" %}}
+{{% insert-md-from-file file="using_ec2_spot_instances_with_eks/010_prerequisites/at_an_aws_validaterole.md" %}}
 
 {{% notice note %}}
-Since we have already setup the prerequisites, **you can head straight to [Test the Cluster]({{<  relref "/using_ec2_spot_instances_with_eks/eksctl/test.md"  >}})**
+Since we have already setup the prerequisites, **you can head straight to [Test the Cluster]({{<  relref "/using_ec2_spot_instances_with_eks/020_eksctl/test.md"  >}})**
 {{% /notice %}}
 
 {{% /expand%}}

diff --git a/...nstances_with_eks/prerequisites/awscli.md → ...nces_with_eks/010_prerequisites/awscli.md b/...nstances_with_eks/prerequisites/awscli.md → ...nces_with_eks/010_prerequisites/awscli.md
diff --git a/...instances_with_eks/prerequisites/clone.md → ...ances_with_eks/010_prerequisites/clone.md b/...instances_with_eks/prerequisites/clone.md → ...ances_with_eks/010_prerequisites/clone.md
diff --git a/...ances_with_eks/prerequisites/eu-west-1.md → ...s_with_eks/010_prerequisites/eu-west-1.md b/...ances_with_eks/prerequisites/eu-west-1.md → ...s_with_eks/010_prerequisites/eu-west-1.md
diff --git a/...tances_with_eks/prerequisites/k8stools.md → ...es_with_eks/010_prerequisites/k8stools.md b/...tances_with_eks/prerequisites/k8stools.md → ...es_with_eks/010_prerequisites/k8stools.md
diff --git a/...ks/prerequisites/on_your_own_updateiam.md → ...10_prerequisites/on_your_own_updateiam.md b/...ks/prerequisites/on_your_own_updateiam.md → ...10_prerequisites/on_your_own_updateiam.md
diff --git a/...prerequisites/on_your_own_validaterole.md → ...prerequisites/on_your_own_validaterole.md b/...prerequisites/on_your_own_validaterole.md → ...prerequisites/on_your_own_validaterole.md
diff --git a/...iles/eks-spot-workshop-quickstart-cnf.yml → ...iles/eks-spot-workshop-quickstart-cnf.yml b/...iles/eks-spot-workshop-quickstart-cnf.yml → ...iles/eks-spot-workshop-quickstart-cnf.yml
diff --git a/...nces_with_eks/prerequisites/self_paced.md → ..._with_eks/010_prerequisites/self_paced.md b/...nces_with_eks/prerequisites/self_paced.md → ..._with_eks/010_prerequisites/self_paced.md
@@ -5,7 +5,7 @@ weight: 10
 ---
 
 {{% notice warning %}}
-Only complete this section if you are running the workshop on your own. If you are at an AWS hosted event (such as re:Invent, Kubecon, Immersion Day, etc), go to [Start the workshop at an AWS event]({{< ref "/using_ec2_spot_instances_with_eks/prerequisites/aws_event.md" >}}).
+Only complete this section if you are running the workshop on your own. If you are at an AWS hosted event (such as re:Invent, Kubecon, Immersion Day, etc), go to [Start the workshop at an AWS event]({{< ref "/using_ec2_spot_instances_with_eks/010_prerequisites/aws_event.md" >}}).
 {{% /notice %}}
 
 ### Running the workshop on your own
@@ -34,4 +34,4 @@ as an IAM user with administrator access to the AWS account:
 ![Login URL](/images/using_ec2_spot_instances_with_eks/prerequisites/iam-4-save-url.png)
 
 
-Once you have completed the step above, **you can head straight to [Create a Workspace]({{<  ref "/using_ec2_spot_instances_with_eks/prerequisites/workspace.md"  >}})**
+Once you have completed the step above, **you can head straight to [Create a Workspace]({{<  ref "/using_ec2_spot_instances_with_eks/010_prerequisites/workspace.md"  >}})**
diff --git a/...nstances_with_eks/prerequisites/sshkey.md → ...nces_with_eks/010_prerequisites/sshkey.md b/...nstances_with_eks/prerequisites/sshkey.md → ...nces_with_eks/010_prerequisites/sshkey.md
diff --git a/...rerequisites/update_workspace_settings.md → ...rerequisites/update_workspace_settings.md b/...rerequisites/update_workspace_settings.md → ...rerequisites/update_workspace_settings.md
diff --git a/..._eks/prerequisites/update_workspaceiam.md → .../010_prerequisites/update_workspaceiam.md b/..._eks/prerequisites/update_workspaceiam.md → .../010_prerequisites/update_workspaceiam.md
@@ -4,7 +4,7 @@ chapter: false
 weight: 60
 ---
 
-{{% insert-md-from-file file="using_ec2_spot_instances_with_eks/prerequisites/update_workspace_settings.md" %}}
+{{% insert-md-from-file file="using_ec2_spot_instances_with_eks/010_prerequisites/update_workspace_settings.md" %}}
 
 We should configure our aws cli with our current region as default:
 ```
@@ -17,5 +17,5 @@ aws configure set default.region ${AWS_REGION}
 aws configure get default.region
 ```
 
-{{% insert-md-from-file file="using_ec2_spot_instances_with_eks/prerequisites/validate_workspace_role.md" %}}
+{{% insert-md-from-file file="using_ec2_spot_instances_with_eks/010_prerequisites/validate_workspace_role.md" %}}
 
diff --git a/...ances_with_eks/prerequisites/us-east-1.md → ...s_with_eks/010_prerequisites/us-east-1.md b/...ances_with_eks/prerequisites/us-east-1.md → ...s_with_eks/010_prerequisites/us-east-1.md
diff --git a/...ances_with_eks/prerequisites/us-east-2.md → ...s_with_eks/010_prerequisites/us-east-2.md b/...ances_with_eks/prerequisites/us-east-2.md → ...s_with_eks/010_prerequisites/us-east-2.md
diff --git a/...ances_with_eks/prerequisites/us-west-2.md → ...s_with_eks/010_prerequisites/us-west-2.md b/...ances_with_eks/prerequisites/us-west-2.md → ...s_with_eks/010_prerequisites/us-west-2.md
diff --git a/.../prerequisites/validate_workspace_role.md → ..._prerequisites/validate_workspace_role.md b/.../prerequisites/validate_workspace_role.md → ..._prerequisites/validate_workspace_role.md
diff --git a/...ances_with_eks/prerequisites/workspace.md → ...s_with_eks/010_prerequisites/workspace.md b/...ances_with_eks/prerequisites/workspace.md → ...s_with_eks/010_prerequisites/workspace.md
diff --git a/..._eks/prerequisites/workspace_at_launch.md → .../010_prerequisites/workspace_at_launch.md b/..._eks/prerequisites/workspace_at_launch.md → .../010_prerequisites/workspace_at_launch.md
diff --git a/..._spot_instances_with_eks/eksctl/_index.md → ...t_instances_with_eks/020_eksctl/_index.md b/..._spot_instances_with_eks/eksctl/_index.md → ...t_instances_with_eks/020_eksctl/_index.md
diff --git a/...sctl/create_eks_cluster_eksctl_command.md → ...sctl/create_eks_cluster_eksctl_command.md b/...sctl/create_eks_cluster_eksctl_command.md → ...sctl/create_eks_cluster_eksctl_command.md
diff --git a/...s.files/eksworkshop-kubeflow.yml.template → ...s.files/eksworkshop-kubeflow.yml.template b/...s.files/eksworkshop-kubeflow.yml.template → ...s.files/eksworkshop-kubeflow.yml.template
diff --git a/.../launcheks.files/eksworkshop.yml.template → .../launcheks.files/eksworkshop.yml.template b/.../launcheks.files/eksworkshop.yml.template → .../launcheks.files/eksworkshop.yml.template
diff --git a/...ot_instances_with_eks/eksctl/launcheks.md → ...nstances_with_eks/020_eksctl/launcheks.md b/...ot_instances_with_eks/eksctl/launcheks.md → ...nstances_with_eks/020_eksctl/launcheks.md
@@ -6,17 +6,17 @@ weight: 20
 
 
 {{% notice warning %}}
-**DO NOT PROCEED** with this step unless you have [validated the IAM role]({{< relref "../prerequisites/update_workspaceiam.md#validate_iam" >}}) in use by the Cloud9 IDE. You will not be able to run the necessary kubectl commands in the later modules unless the EKS cluster is built using the IAM role.
+**DO NOT PROCEED** with this step unless you have [validated the IAM role]({{< relref "../010_prerequisites/update_workspaceiam.md#validate_iam" >}}) in use by the Cloud9 IDE. You will not be able to run the necessary kubectl commands in the later modules unless the EKS cluster is built using the IAM role.
 {{% /notice %}}
 
 #### Challenge:
 **How do I check the IAM role on the workspace?**
 
 {{%expand "Expand here to see the solution" %}}
 
-{{% insert-md-from-file file="using_ec2_spot_instances_with_eks/prerequisites/validate_workspace_role.md" %}}
+{{% insert-md-from-file file="using_ec2_spot_instances_with_eks/010_prerequisites/validate_workspace_role.md" %}}
 
-If you do not see the correct role, please go back and **[validate the IAM role]({{< relref "../prerequisites/update_workspaceiam.md" >}})** for troubleshooting.
+If you do not see the correct role, please go back and **[validate the IAM role]({{< relref "../010_prerequisites/update_workspaceiam.md" >}})** for troubleshooting.
 
 If you do see the correct role, proceed to next step to create an EKS cluster.
 {{% /expand %}}
@@ -26,7 +26,7 @@ If you do see the correct role, proceed to next step to create an EKS cluster.
 
 The following command will create an eks cluster with the name `eksworkshop-eksctl`. It will also create a nodegroup with 2 on-demand instances.
 
-{{% insert-md-from-file file="using_ec2_spot_instances_with_eks/eksctl/create_eks_cluster_eksctl_command.md" %}}
+{{% insert-md-from-file file="using_ec2_spot_instances_with_eks/020_eksctl/create_eks_cluster_eksctl_command.md" %}}
 
 eksctl allows us to pass parameters to initialize the cluster. While initializing the cluster, eksctl does also allow us to create nodegroups.
 

diff --git a/...nstances_with_eks/eksctl/prerequisites.md → ...nces_with_eks/020_eksctl/prerequisites.md b/...nstances_with_eks/eksctl/prerequisites.md → ...nces_with_eks/020_eksctl/prerequisites.md
diff --git a/...c2_spot_instances_with_eks/eksctl/test.md → ...pot_instances_with_eks/020_eksctl/test.md b/...c2_spot_instances_with_eks/eksctl/test.md → ...pot_instances_with_eks/020_eksctl/test.md
diff --git a/...ot_instances_with_eks/helm_root/_index.md → ...nstances_with_eks/030_helm_root/_index.md b/...ot_instances_with_eks/helm_root/_index.md → ...nstances_with_eks/030_helm_root/_index.md
diff --git a/...ith_eks/helm_root/deploy_metric_server.md → ...eks/030_helm_root/deploy_metric_server.md b/...ith_eks/helm_root/deploy_metric_server.md → ...eks/030_helm_root/deploy_metric_server.md
diff --git a/...stances_with_eks/helm_root/helm_deploy.md → ...ces_with_eks/030_helm_root/helm_deploy.md b/...stances_with_eks/helm_root/helm_deploy.md → ...ces_with_eks/030_helm_root/helm_deploy.md
diff --git a/...th_eks/helm_root/install_kube_ops_view.md → ...ks/030_helm_root/install_kube_ops_view.md b/...th_eks/helm_root/install_kube_ops_view.md → ...ks/030_helm_root/install_kube_ops_view.md
diff --git a/..._with_eks/spotmanagednodegroups/_index.md → ...h_eks/040_spotmanagednodegroups/_index.md b/..._with_eks/spotmanagednodegroups/_index.md → ...h_eks/040_spotmanagednodegroups/_index.md
diff --git a/...gednodegroups/selecting_instance_types.md → ...gednodegroups/selecting_instance_types.md b/...gednodegroups/selecting_instance_types.md → ...gednodegroups/selecting_instance_types.md
diff --git a/...ks/spotmanagednodegroups/spotlifecycle.md → ...40_spotmanagednodegroups/spotlifecycle.md b/...ks/spotmanagednodegroups/spotlifecycle.md → ...40_spotmanagednodegroups/spotlifecycle.md
diff --git a/...degroups/why_select_managed_node_group.md → ...degroups/why_select_managed_node_group.md b/...degroups/why_select_managed_node_group.md → ...degroups/why_select_managed_node_group.md
diff --git a/...ksctl.files/spot_nodegroup_4vcpu_16gb.yml → ...ksctl.files/spot_nodegroup_4vcpu_16gb.yml b/...ksctl.files/spot_nodegroup_4vcpu_16gb.yml → ...ksctl.files/spot_nodegroup_4vcpu_16gb.yml
diff --git a/...ksctl.files/spot_nodegroup_8vcpu_32gb.yml → ...ksctl.files/spot_nodegroup_8vcpu_32gb.yml b/...ksctl.files/spot_nodegroup_8vcpu_32gb.yml → ...ksctl.files/spot_nodegroup_8vcpu_32gb.yml
diff --git a/...s/spotmanagednodegroups/workers_eksctl.md → ...0_spotmanagednodegroups/workers_eksctl.md b/...s/spotmanagednodegroups/workers_eksctl.md → ...0_spotmanagednodegroups/workers_eksctl.md
diff --git a/..._instances_with_eks/spotworkers/_index.md → ...h_eks/050_selfmanagednodegroups/_index.md b/..._instances_with_eks/spotworkers/_index.md → ...h_eks/050_selfmanagednodegroups/_index.md
diff --git a/...ces_with_eks/spotworkers/deployhandler.md → ...50_selfmanagednodegroups/deployhandler.md b/...ces_with_eks/spotworkers/deployhandler.md → ...50_selfmanagednodegroups/deployhandler.md
diff --git a/.../preferspot.files/deployment-solution.yml → .../preferspot.files/deployment-solution.yml b/.../preferspot.files/deployment-solution.yml → .../preferspot.files/deployment-solution.yml
diff --git a/...s/spotworkers/selecting_instance_types.md → ...gednodegroups/selecting_instance_types.md b/...s/spotworkers/selecting_instance_types.md → ...gednodegroups/selecting_instance_types.md
@@ -6,6 +6,6 @@ draft: false
 ---
 ### Selecting instances for Spot Instance Diversification
 
-[See "Selecting Instance Types" under Spot managed node groups]({{< relref "/using_ec2_spot_instances_with_eks/spotmanagednodegroups/selecting_instance_types.md" >}})
+[See "Selecting Instance Types" under Spot managed node groups]({{< relref "/using_ec2_spot_instances_with_eks/040_spotmanagednodegroups/selecting_instance_types.md" >}})
 
 Once you finish selecting instance types, proceed to "Adding Spot Workers with eksctl" section to continue creating Self Managed Spot node groups.
diff --git a/...rs.files/cloudformation_mixed_workers.yml → ...rs.files/cloudformation_mixed_workers.yml b/...rs.files/cloudformation_mixed_workers.yml → ...rs.files/cloudformation_mixed_workers.yml
diff --git a/....files/eksctl_mixed_workers_bootstrap.yml → ....files/eksctl_mixed_workers_bootstrap.yml b/....files/eksctl_mixed_workers_bootstrap.yml → ....files/eksctl_mixed_workers_bootstrap.yml
diff --git a/...es_with_eks/spotworkers/workers_eksctl.md → ...0_selfmanagednodegroups/workers_eksctl.md b/...es_with_eks/spotworkers/workers_eksctl.md → ...0_selfmanagednodegroups/workers_eksctl.md
diff --git a/..._spot_instances_with_eks/deploy/_index.md → ...t_instances_with_eks/060_deploy/_index.md b/..._spot_instances_with_eks/deploy/_index.md → ...t_instances_with_eks/060_deploy/_index.md
diff --git a/..._spot_instances_with_eks/deploy/deploy.md → ...t_instances_with_eks/060_deploy/deploy.md b/..._spot_instances_with_eks/deploy/deploy.md → ...t_instances_with_eks/060_deploy/deploy.md
diff --git a/...stances_with_eks/deploy/monte_carlo_pi.md → ...ces_with_eks/060_deploy/monte_carlo_pi.md b/...stances_with_eks/deploy/monte_carlo_pi.md → ...ces_with_eks/060_deploy/monte_carlo_pi.md
diff --git a/...e-carlo-pi-service-final-self-managed.yml → ...e-carlo-pi-service-final-self-managed.yml b/...e-carlo-pi-service-final-self-managed.yml → ...e-carlo-pi-service-final-self-managed.yml
diff --git a/...ty.files/monte-carlo-pi-service-final.yml → ...ty.files/monte-carlo-pi-service-final.yml b/...ty.files/monte-carlo-pi-service-final.yml → ...ty.files/monte-carlo-pi-service-final.yml
diff --git a/...th_eks/deploy/tolerations_and_affinity.md → ...ks/060_deploy/tolerations_and_affinity.md b/...th_eks/deploy/tolerations_and_affinity.md → ...ks/060_deploy/tolerations_and_affinity.md
diff --git a/...spot_instances_with_eks/scaling/_index.md → ..._instances_with_eks/070_scaling/_index.md b/...spot_instances_with_eks/scaling/_index.md → ..._instances_with_eks/070_scaling/_index.md
diff --git a/...pot_instances_with_eks/scaling/cleanup.md → ...instances_with_eks/070_scaling/cleanup.md b/...pot_instances_with_eks/scaling/cleanup.md → ...instances_with_eks/070_scaling/cleanup.md
diff --git a/...ng/deploy_ca.files/cluster_autoscaler.yml → ...ng/deploy_ca.files/cluster_autoscaler.yml b/...ng/deploy_ca.files/cluster_autoscaler.yml → ...ng/deploy_ca.files/cluster_autoscaler.yml
diff --git a/...t_instances_with_eks/scaling/deploy_ca.md → ...stances_with_eks/070_scaling/deploy_ca.md b/...t_instances_with_eks/scaling/deploy_ca.md → ...stances_with_eks/070_scaling/deploy_ca.md
diff --git a/..._instances_with_eks/scaling/deploy_hpa.md → ...tances_with_eks/070_scaling/deploy_hpa.md b/..._instances_with_eks/scaling/deploy_hpa.md → ...tances_with_eks/070_scaling/deploy_hpa.md
diff --git a/...pot_instances_with_eks/scaling/test_ca.md → ...instances_with_eks/070_scaling/test_ca.md b/...pot_instances_with_eks/scaling/test_ca.md → ...instances_with_eks/070_scaling/test_ca.md
diff --git a/...ot_instances_with_eks/scaling/test_hpa.md → ...nstances_with_eks/070_scaling/test_hpa.md b/...ot_instances_with_eks/scaling/test_hpa.md → ...nstances_with_eks/070_scaling/test_hpa.md
diff --git a/...spot_instances_with_eks/jenkins/_index.md → ..._instances_with_eks/080_jenkins/_index.md b/...spot_instances_with_eks/jenkins/_index.md → ..._instances_with_eks/080_jenkins/_index.md
diff --git a/...ces_with_eks/jenkins/autoscaling_nodes.md → ...with_eks/080_jenkins/autoscaling_nodes.md b/...ces_with_eks/jenkins/autoscaling_nodes.md → ...with_eks/080_jenkins/autoscaling_nodes.md
diff --git a/...with_eks/jenkins/increasing_resilience.md → ..._eks/080_jenkins/increasing_resilience.md b/...with_eks/jenkins/increasing_resilience.md → ..._eks/080_jenkins/increasing_resilience.md
diff --git a/...ances_with_eks/jenkins/jenkins_cleanup.md → ...s_with_eks/080_jenkins/jenkins_cleanup.md b/...ances_with_eks/jenkins/jenkins_cleanup.md → ...s_with_eks/080_jenkins/jenkins_cleanup.md
diff --git a/...nstances_with_eks/jenkins/running_jobs.md → ...nces_with_eks/080_jenkins/running_jobs.md b/...nstances_with_eks/jenkins/running_jobs.md → ...nces_with_eks/080_jenkins/running_jobs.md
diff --git a/...nstances_with_eks/jenkins/setup_agents.md → ...nces_with_eks/080_jenkins/setup_agents.md b/...nstances_with_eks/jenkins/setup_agents.md → ...nces_with_eks/080_jenkins/setup_agents.md
diff --git a/...stances_with_eks/jenkins/setup_jenkins.md → ...ces_with_eks/080_jenkins/setup_jenkins.md b/...stances_with_eks/jenkins/setup_jenkins.md → ...ces_with_eks/080_jenkins/setup_jenkins.md
diff --git a/content/using_ec2_spot_instances_with_eks/090_emroneks/010_prereqs.md b/content/using_ec2_spot_instances_with_eks/090_emroneks/010_prereqs.md
@@ -0,0 +1,130 @@
+---
+title: "Prerequisites"
+date: 2021-03-15T16:24:50-04:00
+weight: 10
+draft: false
+---
+
+
+In this chapter, we will prepare your EKS cluster so that it is integrated with EMR on EKS.
+
+{{% notice note %}}
+If you don't have EKS cluster with Spot Managed Node Groups then please review instructions from **[start the workshop]({{< relref "../010_prerequisites" >}})**, **[launch using eksctl]({{< relref "../020_eksctl" >}})**, **[create Spot managed node groups]({{< relref "../040_spotmanagednodegroups" >}})** and **[deploy cluster autoscaler]({{< relref "../070_scaling/deploy_ca.md" >}})** modules.
+{{% /notice %}}
+
+### Create namespace and RBAC permissions
+
+Let's create a namespace '**spark**' in our EKS cluster. After this, we will use the automation powered by eksctl for creating RBAC permissions and for adding EMR on EKS service-linked role into aws-auth configmap
+
+```
+kubectl create namespace spark
+
+eksctl create iamidentitymapping --cluster eksworkshop-eksctl  --namespace spark --service-name "emr-containers"
+```
+
+### Enable IAM Roles for Service Account (IRSA)
+
+Your cluster should already have OpenID Connect provider URL. Only configuration that is needed is to associate IAM with OIDC. You can do that by running this command
+
+```
+eksctl utils associate-iam-oidc-provider --cluster eksworkshop-eksctl --approve
+```
+
+### Create IAM Role for job execution
+
+Let's create the role that EMR will use for job execution. This is the role, EMR jobs will assume when they run on EKS.
+
+```
+cat <<EoF > ~/environment/emr-trust-policy.json
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Effect": "Allow",
+      "Principal": {
+        "Service": "elasticmapreduce.amazonaws.com"
+      },
+      "Action": "sts:AssumeRole"
+    }
+  ]
+}
+EoF
+
+aws iam create-role --role-name EMRContainers-JobExecutionRole --assume-role-policy-document file://~/environment/emr-trust-policy.json
+
+```
+
+Next, we need to attach the required IAM policies to the role so it can write logs to s3 and cloudwatch. 
+```
+cat <<EoF > ~/environment/EMRContainers-JobExecutionRole.json
+{
+    "Version": "2012-10-17",
+    "Statement": [
+        {
+            "Effect": "Allow",
+            "Action": [
+                "s3:PutObject",
+                "s3:GetObject",
+                "s3:ListBucket"
+            ],
+            "Resource": "*"
+        },
+        {
+            "Effect": "Allow",
+            "Action": [
+                "logs:PutLogEvents",
+                "logs:CreateLogStream",
+                "logs:DescribeLogGroups",
+                "logs:DescribeLogStreams"
+            ],
+            "Resource": [
+                "arn:aws:logs:*:*:*"
+            ]
+        }
+    ]
+}  
+EoF
+aws iam put-role-policy --role-name EMRContainers-JobExecutionRole --policy-name EMR-Containers-Job-Execution --policy-document file://~/environment/EMRContainers-JobExecutionRole.json
+```
+
+### Update trust relationship for job execution role
+
+Now we need to update the trust relationship between IAM role we just created with EMR service identity.
+
+```
+aws emr-containers update-role-trust-policy --cluster-name eksworkshop-eksctl --namespace spark --role-name EMRContainers-JobExecutionRole
+```
+
+### Register EKS cluster with EMR
+
+The final step is to register EKS cluster with EMR.
+
+```
+aws emr-containers create-virtual-cluster \
+--name eksworkshop-eksctl \
+--container-provider '{
+    "id": "eksworkshop-eksctl",
+    "type": "EKS",
+    "info": {
+        "eksInfo": {
+            "namespace": "spark"
+        }
+    }
+}'
+```
+After you register, you should get confirmation that your EMR virtual cluster is created. A virtual cluster is an EMR concept which means that EMR service is registered to Kubernetes namespace and it can run jobs in that namespace.
+
+```output
+    "id": "av6h2hk8fsyu12m5ru8zjg8ht",
+    "name": "eksworkshop-eksctl",
+    "arn": "arn:aws:emr-containers:xx-xxxx-x:xxxxxxxxxxxx:/virtualclusters/av6h2hk8fsyu12m5ru8zjg8ht"
+```
+
+
+### Create S3 code bucket
+Let's create a s3 bucket to upload sample scripts and logs.
+
+```sh
+export s3DemoBucket=s3://emr-eks-demo-${ACCOUNT_ID}-${AWS_REGION}
+aws s3 mb $s3DemoBucket
+```
diff --git a/content/using_ec2_spot_instances_with_eks/090_emroneks/020_deploy.md b/content/using_ec2_spot_instances_with_eks/090_emroneks/020_deploy.md
@@ -0,0 +1,116 @@
+---
+title: "Run Sample Workload"
+date: 2021-05-11T13:38:18+08:00
+weight: 20
+draft: false
+---
+
+### Spark Pod Template 
+Beginning with Amazon EMR versions `5.33.0 or 6.3.0`, Amazon EMR on EKS supports Spark’s pod template feature. Pod templates are specifications that determine how to run each pod. You can use pod template files to define the driver or executor pod’s configurations that Spark configurations do not support.
+
+{{% notice info %}}
+For more information about the pod templates support in EMR on EKS, see [Pod Templates](https://docs.aws.amazon.com/emr/latest/EMR-on-EKS-DevelopmentGuide/pod-templates.html).
+{{% /notice %}}
+
+To reduce costs, you can schedule Spark driver tasks to run on On-Demand instances while scheduling Spark executor tasks to run on Spot instances.
+
+With pod templates you can define label `eks.amazonaws.com/capacityType` as a [node selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/), so that you can schedule Spark driver pods on On-demand Instances and Spark executor pods on the Spot Instances.
+
+Now, you will create a sample pod template for Spark Driver. Using nodeSelector `eks.amazonaws.com/capacityType: ON_DEMAND` this will run on On-demand Instances.
+```sh
+cat > spark_driver_pod_template.yml <<EOF 
+apiVersion: v1
+kind: Pod
+spec:
+  volumes:
+    - name: source-data-volume
+      emptyDir: {}
+    - name: metrics-files-volume
+      emptyDir: {}
+  nodeSelector:
+    eks.amazonaws.com/capacityType: ON_DEMAND
+  containers:
+  - name: spark-kubernetes-driver # This will be interpreted as Spark driver container
+EOF
+```
+
+Next, you will create a sample pod template for Spark executors. Using nodeSelector `eks.amazonaws.com/capacityType: SPOT` this will run on Spot Instances.
+```sh
+cat > spark_executor_pod_template.yml <<EOF 
+apiVersion: v1
+kind: Pod
+spec:
+  volumes:
+    - name: source-data-volume
+      emptyDir: {}
+    - name: metrics-files-volume
+      emptyDir: {}
+  nodeSelector:
+    eks.amazonaws.com/capacityType: SPOT
+  containers:
+  - name: spark-kubernetes-executor # This will be interpreted as Spark executor container
+EOF
+```
+
+Let's upload sample pod templates and python script to s3 bucket. 
+
+```sh
+aws s3 cp threadsleep.py ${s3DemoBucket}
+aws s3 cp spark_driver_pod_template.yml ${s3DemoBucket}/pod_templates/
+aws s3 cp spark_executor_pod_template.yml ${s3DemoBucket}/pod_templates/
+```
+
+Next we submit the job.
+
+```sh
+#Get required virtual cluster-id and role arn
+export VIRTUAL_CLUSTER_ID=$(aws emr-containers list-virtual-clusters --query "virtualClusters[?state=='RUNNING'].id" --output text)
+
+export EMR_ROLE_ARN=$(aws iam get-role --role-name EMRContainers-JobExecutionRole --query Role.Arn --output text)
+
+#start spark job with start-job-run
+aws emr-containers start-job-run \
+  --virtual-cluster-id $VIRTUAL_CLUSTER_ID \
+  --name pi-spot \
+  --execution-role-arn $EMR_ROLE_ARN \
+  --release-label emr-5.33.0-latest \
+  --job-driver '{
+    "sparkSubmitJobDriver": {
+      "entryPoint": "'${s3DemoBucket}'/threadsleep.py",
+      "sparkSubmitParameters": "--conf spark.kubernetes.driver.podTemplateFile=\"'${s3DemoBucket}'/pod_templates/spark_driver_pod_template.yml\" --conf spark.kubernetes.executor.podTemplateFile=\"'${s3DemoBucket}'/pod_templates/spark_executor_pod_template.yml\" --conf spark.executor.instances=15 --conf spark.executor.memory=2G --conf spark.executor.cores=2 --conf spark.driver.cores=1"}}' \
+  --configuration-overrides '{
+        "applicationConfiguration": [
+            {
+                "classification": "spark-defaults",
+                "properties": {
+                  "spark.dynamicAllocation.enabled": "false",
+                  "spark.kubernetes.executor.deleteOnTermination": "true"
+                }
+            }
+        ],
+        "monitoringConfiguration": {
+            "cloudWatchMonitoringConfiguration": {
+                "logGroupName": "/emr-on-eks/eksworkshop-eksctl",
+                "logStreamNamePrefix": "pi"
+            },
+            "s3MonitoringConfiguration": {
+                "logUri": "'${s3DemoBucket}'/"
+            }
+        }
+    }'
+```
+
+You will be able to see the completed job in EMR console. 
+
+Let's check the pods deployed on On-Demand Instances and should now see Spark driver pods running on On-Demand instances.
+
+```sh
+ for n in $(kubectl get nodes -l eks.amazonaws.com/capacityType=ON_DEMAND --no-headers | cut -d " " -f1); do echo "Pods on instance ${n}:";kubectl get pods -n spark  --no-headers --field-selector spec.nodeName=${n} ; echo ; done
+```
+
+Let's check the pods deployed on Spot Instances and should now see Spark executor pods running on Spot Instances.
+
+```sh
+ for n in $(kubectl get nodes -l eks.amazonaws.com/capacityType=SPOT --no-headers | cut -d " " -f1); do echo "Pods on instance ${n}:";kubectl get pods -n spark  --no-headers --field-selector spec.nodeName=${n} ; echo ; done
+```
+