Merge Conflict Resolution

Author: Scott Malkie

02-path-working-with-clusters/204-cluster-logging-with-EFK/readme.adoc

@@ -32,7 +32,7 @@ This example creates a two instance Amazon Elasticsearch cluster named `kubernet
       --ebs-options EBSEnabled=true,VolumeType=standard,VolumeSize=100 \
       --access-policies '{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Principal":{"AWS":["*"]},"Action":["es:*"],"Resource":"*"}]}'
 
-It takes a little while for the cluster to be created and arrive at an `active` state. The AWS Console should show the following status when the cluster is ready:
+It takes a little while for the cluster to be created and arrive at an `active` state. The https://console.aws.amazon.com/es/home[AWS Console] should show the following status when the cluster is ready:
 
 image::logging-cloudwatch-es-cluster.png[]
 
@@ -53,8 +53,6 @@ Create a CloudWatch log group:
 
     aws logs create-log-group --log-group-name kubernetes-logs
 
-Create the log group in the same region as your cluster.
-
 == Deploy Fluentd
 
 === Log group name and log stream name
@@ -77,7 +75,9 @@ Fluentd log group name and stream name are configured in the file `templates/flu
         num_threads 8
       </match>
 
-It uses the log group name of `kubernetes-logs` and the log stream name of `fluentd-cloudwatch`. If a different log group name is used in the previous command or a different log stream name is needed, then that needs to be configured in this configuration file.
+It uses the default log group name of `kubernetes-logs` and the log stream name of `fluentd-cloudwatch`. 
+
+If you've followed the instructions in this chapter as is, then no change is required in this configuration file. However if a different log group name is used in the previous command or a different log stream name is needed, then that needs to be configured in this configuration file.
 
 === IAM configuration
 

cicd/codesuite/README.adoc

@@ -0,0 +1,23 @@
+= Codesuite - Continuous Deployment
+:toc:
+:icons:
+:linkcss:
+:imagesdir: ../images
+
+= CodeSuite - Continuous Deployment Reference Architecture for Kubernetes
+
+The CodeSuite Continuous Deployment reference architecture demonstrates how to achieve continuous
+deployment of an application to a Kubernetes cluster using AWS CodePipeline, AWS CodeCommit, AWS CodeBuild and AWS Lambda.
+
+Launching this AWS CloudFormation stack provisions a continuous deployment process that uses AWS CodePipeline
+to monitor an AWS CodeCommit repository for new commits, AWS CodeBuild to create a new Docker container image and to push
+it into Amazon ECR. Finally an AWS Lambda function with the Kubernetes Python SDK updates a Kubernetes deployment in a live cluster.
+
+When you deploy the cloudformation stack there will be four parameters that are specific to your Kubernetes cluster. You will need the API endpoint (enter only the subdomain and omit 'api'), Certificate Authority Data, Client Certificate Data and Client Key Data.
+The last of these three are sensitive, the cloudformation parameter is marked with the "NoEcho" property set to true so that the contents are not exposed through cloudformation. In addition those strings are encrypted with the account default
+KMS key and stored in parameter store. The Lambda function that authenticates to your Kubernetes API endpoint is assigned an IAM role that has permission to access those keys. The Lambda function builds a config file in the tmpfs directory of the Lambda which is in memory
+so that when the Lambda function terminates the secrets are gone.
+
+image::../../images/cicd.png[Architecture]
+
+Head over the https://github.com/aws-samples/aws-kube-codesuite[repo] to deploy this architecture into your own cluster.