Template adjustments for new paths

aws-quickstart · Sep 27, 2021 · 13fdfe8 · 13fdfe8
1 parent 9521c13
commit 13fdfe8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 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
@@ -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
@@ -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: