From 13fdfe8c3596c6633cf42d0dddc68dbfcbf36fbd Mon Sep 17 00:00:00 2001 From: Andrew Gargan Date: Mon, 27 Sep 2021 14:14:31 -0700 Subject: [PATCH] Template adjustments for new paths --- .../templates/eks-cluster-prework.template.yaml | 6 +++--- .../templates/prework.template.yaml | 12 +++++++++++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/blog-assets/eks-cluster-prework/templates/eks-cluster-prework.template.yaml b/blog-assets/eks-cluster-prework/templates/eks-cluster-prework.template.yaml index 9f116d1..b9c4e8f 100644 --- a/blog-assets/eks-cluster-prework/templates/eks-cluster-prework.template.yaml +++ b/blog-assets/eks-cluster-prework/templates/eks-cluster-prework.template.yaml @@ -12,7 +12,7 @@ Parameters: Default: 'aws-quickstart' PreworkScriptObject: Type: String - Default: 'quickstart-examples/samples/eks-cluster-prework/script/pw-script.sh' + Default: 'quickstart-examples/blog-assets/eks-cluster-prework/script/pw-script.sh' Resources: EKSStack: Type: AWS::CloudFormation::Stack @@ -31,10 +31,10 @@ Resources: PreworkStack: Type: AWS::CloudFormation::Stack Properties: - TemplateURL: 'https://aws-quickstart.s3.us-east-1.amazonaws.com/quickstart-examples/samples/eks-cluster-prework/templates/prework.template.yaml' + TemplateURL: 'https://aws-quickstart.s3.us-east-1.amazonaws.com/quickstart-examples/blog-assets/eks-cluster-prework/templates/prework.template.yaml' Parameters: ClusterName: !Sub "EKSStack.Outputs.EKSClusterName" PreworkScriptBucket: "aws-quickstart" - PreworkScriptObject: "quickstart-examples/samples/eks-cluster-prework/scripts/pw-script.sh" + PreworkScriptObject: !Ref "PreworkScriptObject" JobName: !Ref "PreWorkJobName" KubernetesNameSpace: !Ref "PreworkNamespace" diff --git a/blog-assets/eks-cluster-prework/templates/prework.template.yaml b/blog-assets/eks-cluster-prework/templates/prework.template.yaml index cfd4e66..4ad336d 100644 --- a/blog-assets/eks-cluster-prework/templates/prework.template.yaml +++ b/blog-assets/eks-cluster-prework/templates/prework.template.yaml @@ -8,7 +8,7 @@ Parameters: Default: aws-quickstart PreworkScriptObject: Type: String - Default: "quickstart-examples/samples/eks-cluster-prework/scripts/pw-script.sh" + Default: "quickstart-examples/blog-assets/eks-cluster-prework/scripts/pw-script.sh" JobName: Type: String Default: ExampleJob @@ -52,6 +52,16 @@ Resources: - s3:GetObject Resource: - !Sub "arn:aws:s3:::${PreworkScriptBucket}/${PreworkScriptObject}" + PeworkNameSpace: + Type: "AWSQS::Kubernetes::Resource" + Properties: + ClusterName: !Ref ClusterName + Manifest: !Sub | + kind: Namespace + apiVersion: v1 + metadata: + name: ${KubernetesNameSpace} + Namespace: default KubernetesRole: Type: AWSQS::Kubernetes::Resource Properties: