Update template for EKS

README.adoc

@@ -24,17 +24,17 @@ A functioning Kubernetes cluster and config file to authenticate to the cluster,
 
 Clone this repository
 
-    git clone https://github.com/aws-samples/aws-kube-codesuite
+git clone https://github.com/aws-samples/aws-kube-codesuite
 
 This creates a directory named `aws-kube-codesuite` in your current directory, which contains the code we need for this tutorial. Change to this directory.
 
 === Application - initial deployment and service Provisioning
 
-    kubectl apply -f ./kube-manifests/deploy-first.yml
+kubectl apply -f ./kube-manifests/deploy-first.yml
 
 Find the service endpoint to view the application:
 
-    kubectl get svc codesuite-demo -o wide
+kubectl get svc codesuite-demo -o wide
 
 If you copy and paste the External IP from the codesuite-demo service into a browser you should see the nginx homepage.
 
@@ -44,38 +44,38 @@ Note, deploy this stack in the same region as your k8s cluster. Your cluster nod
 
 |===
 
-|Region | Launch Template for Kubernetes | Launch Template for Amazon EKS
+    |Region | Launch Template for Kubernetes | Launch Template for Amazon EKS
 | *N. Virginia* (us-east-1)
-a| image::./deploy-to-aws.png[link=https://console.aws.amazon.com/cloudformation/home?region=us-east-1#/stacks/new?stackName=Codesuite-Demo&templateURL=https://s3.amazonaws.com/codesuite-demo-public/aws-refarch-codesuite-kubernetes.yaml]
-a| image::./deploy-to-aws.png[link=https://console.aws.amazon.com/cloudformation/home?region=us-east-1#/stacks/new?stackName=Codesuite-Demo&templateURL=https://s3-us-west-2.amazonaws.com/aws-eks-codesuite/aws-refarch-codesuite-kubernetes.yaml]
+    a| image::./deploy-to-aws.png[link=https://console.aws.amazon.com/cloudformation/home?region=us-east-1#/stacks/new?stackName=Codesuite-Demo&templateURL=https://s3.amazonaws.com/codesuite-demo-public/aws-refarch-codesuite-kubernetes.yaml]
+    a| image::./deploy-to-aws.png[link=https://console.aws.amazon.com/cloudformation/home?region=us-east-1#/stacks/new?stackName=Codesuite-Demo&templateURL=https://s3.amazonaws.com/codesuite-demo-public/eks/aws-refarch-codesuite-kubernetes.yaml]
 
 | *Ohio* (us-east-2)
-a| image::./deploy-to-aws.png[link=https://console.aws.amazon.com/cloudformation/home?region=us-east-2#/stacks/new?stackName=Codesuite-Demo&templateURL=https://s3.amazonaws.com/codesuite-demo-public/aws-refarch-codesuite-kubernetes.yaml]
-a|
+    a| image::./deploy-to-aws.png[link=https://console.aws.amazon.com/cloudformation/home?region=us-east-2#/stacks/new?stackName=Codesuite-Demo&templateURL=https://s3.amazonaws.com/codesuite-demo-public/aws-refarch-codesuite-kubernetes.yaml]
+    a| image::./deploy-to-aws.png[link=https://console.aws.amazon.com/cloudformation/home?region=us-east-2#/stacks/new?stackName=Codesuite-Demo&templateURL=https://s3.amazonaws.com/codesuite-demo-public/eks/aws-refarch-codesuite-kubernetes.yaml]
 
 | *Oregon* (us-west-2)
-a| image::./deploy-to-aws.png[link=https://console.aws.amazon.com/cloudformation/home?region=us-west-2#/stacks/new?stackName=Codesuite-Demo&templateURL=https://s3.amazonaws.com/codesuite-demo-public/aws-refarch-codesuite-kubernetes.yaml]
-a| image::./deploy-to-aws.png[link=https://console.aws.amazon.com/cloudformation/home?region=us-west-2#/stacks/new?stackName=Codesuite-Demo&templateURL=https://s3-us-west-2.amazonaws.com/aws-eks-codesuite/aws-refarch-codesuite-kubernetes.yaml]
+    a| image::./deploy-to-aws.png[link=https://console.aws.amazon.com/cloudformation/home?region=us-west-2#/stacks/new?stackName=Codesuite-Demo&templateURL=https://s3.amazonaws.com/codesuite-demo-public/aws-refarch-codesuite-kubernetes.yaml]
+    a| image::./deploy-to-aws.png[link=https://console.aws.amazon.com/cloudformation/home?region=us-west-2#/stacks/new?stackName=Codesuite-Demo&templateURL=https://s3.amazonaws.com/codesuite-demo-public/eks/aws-refarch-codesuite-kubernetes.yaml]
 
 | *Ireland* (eu-west-1)
 a| image::./deploy-to-aws.png[link=https://console.aws.amazon.com/cloudformation/home?region=eu-west-1#/stacks/new?stackName=Codesuite-Demo&templateURL=https://s3.amazonaws.com/codesuite-demo-public/aws-refarch-codesuite-kubernetes.yaml]
-a| image::./deploy-to-aws.png[link=https://console.aws.amazon.com/cloudformation/home?region=eu-west-1#/stacks/new?stackName=Codesuite-Demo&templateURL=https://s3-us-west-2.amazonaws.com/aws-eks-codesuite/aws-refarch-codesuite-kubernetes.yaml]
+a| image::./deploy-to-aws.png[link=https://console.aws.amazon.com/cloudformation/home?region=eu-west-1#/stacks/new?stackName=Codesuite-Demo&templateURL=https://s3.amazonaws.com/codesuite-demo-public/eks/aws-refarch-codesuite-kubernetes.yaml]
 
 | *Frankfurt* (eu-central-1)
 a| image::./deploy-to-aws.png[link=https://console.aws.amazon.com/cloudformation/home?region=eu-central-1#/stacks/new?stackName=Codesuite-Demo&templateURL=https://s3.amazonaws.com/codesuite-demo-public/aws-refarch-codesuite-kubernetes.yaml]
-a|
+a| image::./deploy-to-aws.png[link=https://console.aws.amazon.com/cloudformation/home?region=eu-central-1#/stacks/new?stackName=Codesuite-Demo&templateURL=https://s3.amazonaws.com/codesuite-demo-public/eks/aws-refarch-codesuite-kubernetes.yaml]
 
 | *Singapore* (ap-southeast-1)
 a| image::./deploy-to-aws.png[link=https://console.aws.amazon.com/cloudformation/home?region=ap-southeast-1#/stacks/new?stackName=Codesuite-Demo&templateURL=https://s3.amazonaws.com/codesuite-demo-public/aws-refarch-codesuite-kubernetes.yaml]
-a|
+a| image::./deploy-to-aws.png[link=https://console.aws.amazon.com/cloudformation/home?region=ap-southeast-1#/stacks/new?stackName=Codesuite-Demo&templateURL=https://s3.amazonaws.com/codesuite-demo-public/eks/aws-refarch-codesuite-kubernetes.yaml]
 
 | *Sydney* (ap-southeast-2)
 a| image::./deploy-to-aws.png[link=https://console.aws.amazon.com/cloudformation/home?region=ap-southeast-2#/stacks/new?stackName=Codesuite-Demo&templateURL=https://s3.amazonaws.com/codesuite-demo-public/aws-refarch-codesuite-kubernetes.yaml]
-a|
+a| image::./deploy-to-aws.png[link=https://console.aws.amazon.com/cloudformation/home?region=ap-southeast-2#/stacks/new?stackName=Codesuite-Demo&templateURL=https://s3.amazonaws.com/codesuite-demo-public/eks/aws-refarch-codesuite-kubernetes.yaml]
 
 | *Tokyo* (ap-northeast-1)
 a| image::./deploy-to-aws.png[link=https://console.aws.amazon.com/cloudformation/home?region=ap-northeast-1#/stacks/new?stackName=Codesuite-Demo&templateURL=https://s3.amazonaws.com/codesuite-demo-public/aws-refarch-codesuite-kubernetes.yaml]
-a|
+a| image::./deploy-to-aws.png[link=https://console.aws.amazon.com/cloudformation/home?region=ap-northeast-1#/stacks/new?stackName=Codesuite-Demo&templateURL=https://s3.amazonaws.com/codesuite-demo-public/eks/aws-refarch-codesuite-kubernetes.yaml]
 
 |===
 

eks/templates/aws-refarch-codesuite-kubernetes.yaml

@@ -10,7 +10,7 @@ Parameters:
 
   TemplateBucket:
     Type: String
-    Default: aws-eks-codesuite
+    Default: codesuite-demo-public
 
   BranchName:
     Type: String
@@ -45,14 +45,14 @@ Resources:
   LambdaCopy:
     Type: AWS::CloudFormation::Stack
     Properties:
-      TemplateURL: https://s3.amazonaws.com/aws-eks-codesuite/lambda-copy.yaml
+      TemplateURL: https://s3.amazonaws.com/codesuite-demo-public/eks/lambda-copy.yaml
       Parameters:
         TemplateBucket: !Ref TemplateBucket
 
   Pipeline:
     Type: AWS::CloudFormation::Stack
     Properties:
-      TemplateURL: https://s3.amazonaws.com/aws-eks-codesuite/deployment-pipeline.yaml
+      TemplateURL: https://s3.amazonaws.com/codesuite-demo-public/eks/deployment-pipeline.yaml
       Parameters:
             Name: !Ref AWS::StackName
             TemplateBucket: !Ref TemplateBucket

eks/templates/deployment-pipeline.yaml

@@ -8,7 +8,7 @@ Parameters:
 
   TemplateBucket:
     Type: String
-    Default: aws-eks-codesuite
+    Default: codesuite-demo-public
 
   BranchName:
     Type: String
@@ -276,7 +276,7 @@ Resources:
           - Name: REPOSITORY_URI
             Value: !Sub ${AWS::AccountId}.dkr.ecr.${AWS::Region}.amazonaws.com/${Repository}
           - Name: TEMPLATE_BUCKET
-            Value: !Ref TemplateBucket
+            Value: !Ref LocalBucket
           - Name: DEPLOYMENT_NAME
             Value: !Ref DeploymentName
           - Name: CLUSTER_NAME

eks/templates/lambda-copy.yaml

@@ -8,12 +8,12 @@ Parameters:
 
   TemplateBucket:
     Type: String
-    Default: aws-eks-codesuite
+    Default: codesuite-demo-public
     Description: S3 bucket containing the code deployed by this template
 
   CodeKey:
     Type: String
-    Default: codepipeline.zip
+    Default: "eks/"
     Description: Key prefix for resources referenced from the TemplateBucket
 
 Resources:
@@ -66,6 +66,7 @@ Resources:
                 Resource:
                   - !Sub "arn:aws:s3:::${TemplateBucket}"
                   - !Sub "arn:aws:s3:::${TemplateBucket}/${CodeKey}"
+                  - !Sub "arn:aws:s3:::${TemplateBucket}/*"
               -
                 Sid: DestBucketWriteAccess
                 Effect: Allow