From c4f3f12d70f0bd17b990d34280eae82dbf9d4081 Mon Sep 17 00:00:00 2001 From: Marco Lehmann Date: Tue, 21 May 2024 13:51:05 +0000 Subject: [PATCH 1/2] Fix duplicate key errors in CF templates --- .../files/efficient-auto-scaling-quickstart-cnf.yml | 2 +- .../prerequisites.files/eks-spot-workshop-quickstart-cnf.yml | 2 +- .../prerequisites.files/eks-spot-workshop-quickstart-cnf.yml | 2 +- .../amazon-ec2-spot-cicd-workshop/gitlab-spot/gitlab-deploy.yml | 2 +- .../emr-spark-spot-workshop-quickstarter-cnf.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/content/efficient-and-resilient-ec2-auto-scaling/files/efficient-auto-scaling-quickstart-cnf.yml b/content/efficient-and-resilient-ec2-auto-scaling/files/efficient-auto-scaling-quickstart-cnf.yml index 69c8a5ff..225b2ab2 100644 --- a/content/efficient-and-resilient-ec2-auto-scaling/files/efficient-auto-scaling-quickstart-cnf.yml +++ b/content/efficient-and-resilient-ec2-auto-scaling/files/efficient-auto-scaling-quickstart-cnf.yml @@ -399,7 +399,7 @@ Resources: Tags: - Key: Environment Value: AWS Example - Content: Yaml + DocumentFormat: Yaml DocumentType: Command Content: schemaVersion: '2.2' diff --git a/content/karpenter/010_prerequisites/prerequisites.files/eks-spot-workshop-quickstart-cnf.yml b/content/karpenter/010_prerequisites/prerequisites.files/eks-spot-workshop-quickstart-cnf.yml index 7a320448..d7185335 100644 --- a/content/karpenter/010_prerequisites/prerequisites.files/eks-spot-workshop-quickstart-cnf.yml +++ b/content/karpenter/010_prerequisites/prerequisites.files/eks-spot-workshop-quickstart-cnf.yml @@ -254,7 +254,7 @@ Resources: Tags: - Key: Environment Value: AWS Example - Content: Yaml + DocumentFormat: Yaml DocumentType: Command Content: schemaVersion: '2.2' diff --git a/content/using_ec2_spot_instances_with_eks/010_prerequisites/prerequisites.files/eks-spot-workshop-quickstart-cnf.yml b/content/using_ec2_spot_instances_with_eks/010_prerequisites/prerequisites.files/eks-spot-workshop-quickstart-cnf.yml index c65d9099..48cfb7d8 100644 --- a/content/using_ec2_spot_instances_with_eks/010_prerequisites/prerequisites.files/eks-spot-workshop-quickstart-cnf.yml +++ b/content/using_ec2_spot_instances_with_eks/010_prerequisites/prerequisites.files/eks-spot-workshop-quickstart-cnf.yml @@ -229,7 +229,7 @@ Resources: Tags: - Key: Environment Value: AWS Example - Content: Yaml + DocumentFormat: Yaml DocumentType: Command Content: schemaVersion: '2.2' diff --git a/workshops/amazon-ec2-spot-cicd-workshop/gitlab-spot/gitlab-deploy.yml b/workshops/amazon-ec2-spot-cicd-workshop/gitlab-spot/gitlab-deploy.yml index 3d13bff4..f0e7c57e 100644 --- a/workshops/amazon-ec2-spot-cicd-workshop/gitlab-spot/gitlab-deploy.yml +++ b/workshops/amazon-ec2-spot-cicd-workshop/gitlab-spot/gitlab-deploy.yml @@ -587,7 +587,7 @@ Resources: GitLabWorkshopC9SSMDocument: Type: AWS::SSM::Document Properties: - Content: Yaml + DocumentFormat: Yaml DocumentType: Command Content: schemaVersion: '2.2' diff --git a/workshops/running_spark_apps_with_emr_on_spot_instances/emr-spark-spot-workshop-quickstarter-cnf.yaml b/workshops/running_spark_apps_with_emr_on_spot_instances/emr-spark-spot-workshop-quickstarter-cnf.yaml index 417e9232..f93d94a3 100644 --- a/workshops/running_spark_apps_with_emr_on_spot_instances/emr-spark-spot-workshop-quickstarter-cnf.yaml +++ b/workshops/running_spark_apps_with_emr_on_spot_instances/emr-spark-spot-workshop-quickstarter-cnf.yaml @@ -257,7 +257,7 @@ Resources: Tags: - Key: Environment Value: AWS Example - Content: Yaml + DocumentFormat: Yaml DocumentType: Command Content: schemaVersion: '2.2' From 2ba673cde755d65886dc1bf097fb252f174eacb7 Mon Sep 17 00:00:00 2001 From: Marco Lehmann Date: Tue, 21 May 2024 13:58:11 +0000 Subject: [PATCH 2/2] Use valid enum for YAML --- .../files/efficient-auto-scaling-quickstart-cnf.yml | 2 +- .../prerequisites.files/eks-spot-workshop-quickstart-cnf.yml | 2 +- .../prerequisites.files/eks-spot-workshop-quickstart-cnf.yml | 2 +- .../amazon-ec2-spot-cicd-workshop/gitlab-spot/gitlab-deploy.yml | 2 +- .../emr-spark-spot-workshop-quickstarter-cnf.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/content/efficient-and-resilient-ec2-auto-scaling/files/efficient-auto-scaling-quickstart-cnf.yml b/content/efficient-and-resilient-ec2-auto-scaling/files/efficient-auto-scaling-quickstart-cnf.yml index 225b2ab2..f05d1d36 100644 --- a/content/efficient-and-resilient-ec2-auto-scaling/files/efficient-auto-scaling-quickstart-cnf.yml +++ b/content/efficient-and-resilient-ec2-auto-scaling/files/efficient-auto-scaling-quickstart-cnf.yml @@ -399,7 +399,7 @@ Resources: Tags: - Key: Environment Value: AWS Example - DocumentFormat: Yaml + DocumentFormat: YAML DocumentType: Command Content: schemaVersion: '2.2' diff --git a/content/karpenter/010_prerequisites/prerequisites.files/eks-spot-workshop-quickstart-cnf.yml b/content/karpenter/010_prerequisites/prerequisites.files/eks-spot-workshop-quickstart-cnf.yml index d7185335..09360d12 100644 --- a/content/karpenter/010_prerequisites/prerequisites.files/eks-spot-workshop-quickstart-cnf.yml +++ b/content/karpenter/010_prerequisites/prerequisites.files/eks-spot-workshop-quickstart-cnf.yml @@ -254,7 +254,7 @@ Resources: Tags: - Key: Environment Value: AWS Example - DocumentFormat: Yaml + DocumentFormat: YAML DocumentType: Command Content: schemaVersion: '2.2' diff --git a/content/using_ec2_spot_instances_with_eks/010_prerequisites/prerequisites.files/eks-spot-workshop-quickstart-cnf.yml b/content/using_ec2_spot_instances_with_eks/010_prerequisites/prerequisites.files/eks-spot-workshop-quickstart-cnf.yml index 48cfb7d8..8afc9e7a 100644 --- a/content/using_ec2_spot_instances_with_eks/010_prerequisites/prerequisites.files/eks-spot-workshop-quickstart-cnf.yml +++ b/content/using_ec2_spot_instances_with_eks/010_prerequisites/prerequisites.files/eks-spot-workshop-quickstart-cnf.yml @@ -229,7 +229,7 @@ Resources: Tags: - Key: Environment Value: AWS Example - DocumentFormat: Yaml + DocumentFormat: YAML DocumentType: Command Content: schemaVersion: '2.2' diff --git a/workshops/amazon-ec2-spot-cicd-workshop/gitlab-spot/gitlab-deploy.yml b/workshops/amazon-ec2-spot-cicd-workshop/gitlab-spot/gitlab-deploy.yml index f0e7c57e..32b9852f 100644 --- a/workshops/amazon-ec2-spot-cicd-workshop/gitlab-spot/gitlab-deploy.yml +++ b/workshops/amazon-ec2-spot-cicd-workshop/gitlab-spot/gitlab-deploy.yml @@ -587,7 +587,7 @@ Resources: GitLabWorkshopC9SSMDocument: Type: AWS::SSM::Document Properties: - DocumentFormat: Yaml + DocumentFormat: YAML DocumentType: Command Content: schemaVersion: '2.2' diff --git a/workshops/running_spark_apps_with_emr_on_spot_instances/emr-spark-spot-workshop-quickstarter-cnf.yaml b/workshops/running_spark_apps_with_emr_on_spot_instances/emr-spark-spot-workshop-quickstarter-cnf.yaml index f93d94a3..e3276c49 100644 --- a/workshops/running_spark_apps_with_emr_on_spot_instances/emr-spark-spot-workshop-quickstarter-cnf.yaml +++ b/workshops/running_spark_apps_with_emr_on_spot_instances/emr-spark-spot-workshop-quickstarter-cnf.yaml @@ -257,7 +257,7 @@ Resources: Tags: - Key: Environment Value: AWS Example - DocumentFormat: Yaml + DocumentFormat: YAML DocumentType: Command Content: schemaVersion: '2.2'