Vjsikha 157 cicd challenge question (#172)

oak2278 · brentley · commit c3384b812c01 · 2018-11-21T15:54:17.000-06:00
* Content review and edits. Added Challenge Questions * added challenge question for user to retrieve the elb URL * updated the shortcode to fix the launch button for codepipeline * Batch Processing (redux) (#133) * Batch Processing Workshop (all except advanced example) * Add advanced batch example * Updates based on feedback on PR-133 * Change S3 bucket creation to use AWSCLI * Add IAM policy for artifact S3 access * Add removal instructions for S3 IAM policy * Duplicate ACCOUNT_ID creation per code block where it's used * Clean S3 IAM policy steps * Fix error in ConfigMap for artifact repository (manual substitution) * Delete non-empty bucket * Link fixes (#135) * updating to support cloud9 dev environment * updating repo urls for consistency * commit the link fixes * Tracing with X-Ray module (#132) * Tracing with X-Ray module * Change urls to deployed version * Fix links (#137) * added documentation and examples to demo readiness and liveness probes (#131) * added documentation and examples to demo readiness and liveness probes * simplified text boxes for commands, added additional explanation about how probes work and tweaked readiness probe * added step to make readiness probe pass after failure * updated the folder structure to reflect http paths and guidelines * updated the pages to show and explain the yaml files instead of simply downloading the same * minor edits to add clarity * remove duplicate page (using.md/rolling_back.md) (#140) * updating to support cloud9 dev environment * updating repo urls for consistency * remove duplicate instructions page? * Dynamic Volume Provisioning hyperlink (#141) * adding calico chapter * deleting calico in cleanup step * changing notice from note(blue) to tip(green) * changing chapter weight to fit between example microservices and helm * adding uninstall calico text * separated command from the output * reverting changes to package-lock.json * adding all changes except yaml creation * changing calico resources from links to local files * moved cloning the repo from prereqs to calico chapter * changed dynamic volue hyperlink to k8s doc * Update _index.md (#144) minor grammar changes * Challenge question and answer to Monitoring Chapter (#146) * adding monitoring using prometheus & grafana chapter * changing draft: false * minor change to grafana dashboards * adding challenge question & offering solution * formatting changes - removed for re-emphasizing * minor change with relative links * Remove region (#148) * Remove region * fixing backticks * adding a region selector (#154) * Added challenge question to installnginx.md (#145) * Added challenge question to installnginx.md Challenge question provides clues for the correct helm install syntax. Workshop participant can either figure out the syntax themselves or expand the hidden text for the correct command. * Updated Challenge Formatting and Module Wording Changed the formatting of the challenge to match the requested styling. Made the warning about the ELB creation time more obvious. Miscellaneous wording corrections. * Istiotweaks (#153) * Update _index.md Fixing some grammar and typos. * Update introduction.md Fixed some formatting and grammar. * Update install.md Cleaning up formatting and grammar. * Update deploy.md Fixed grammar and formatting. * Update routing.md Grammar and typo fixes. * Update visualize.md fixed some grammar and typos * Update cleanup.md Cleaning up grammar and typos * Update routing.md Fixed error language message to better illustrate what to expect. * Update _index.md Removing callout * fixing typo in health checks (#155) * adding monitoring using prometheus & grafana chapter * changing draft: false * minor change to grafana dashboards * adding challenge question & offering solution * formatting changes - removed for re-emphasizing * minor change with relative links * fixing typo in health checks chapter * minor improvements in health check chapter * update Batch cleanup.md (#142) Added command to map $ROLE_NAME in case this was lost * Simplify CFN stack creation (#156) * Calico logo, note in StatefulSets -- Test scaling and Batch -- simple workflow (#143) * adding calico chapter * deleting calico in cleanup step * changing notice from note(blue) to tip(green) * changing chapter weight to fit between example microservices and helm * adding uninstall calico text * separated command from the output * reverting changes to package-lock.json * adding all changes except yaml creation * changing calico resources from links to local files * moved cloning the repo from prereqs to calico chapter * changed dynamic volue hyperlink to k8s doc * changed calico chapter index image to official project calico logo * added a note for pods scaling duration * replaced workflow name from command with placeholder * improved changes introduced in commit 5f627f6 * added challenge question for user to retrieve the elb URL * resolved conflicts after rebasing from master * added hint to challenge question * Content review and edits. Added Challenge Questions (#147) * fixed typo in role name. moved challenge question. cleaned up typos. * reverted cf-launch.html changes * reverted codepipeline.md changes for launch button
diff --git a/content/codepipeline/change.md b/content/codepipeline/change.md
@@ -4,6 +4,7 @@ date: 2018-10-087T08:30:11-07:00
 weight: 15
 draft: false
 ---
+#### Update Our Application
 
 So far we have walked through setting up CI/CD for EKS using AWS CodePipeline and now we are going to
 make a change to the GitHub repository so that we can see a new release built and delivered.
@@ -22,21 +23,11 @@ You should leave the master branch selected.
 The main.go application needs to be compiled, so please ensure that you don't accidentally break the build :)
 {{% /notice %}}
 
-
 ![GitHub Modify](/images/codepipeline/github_modify.png)
 
 After you modify and commit your change in GitHub, in approximately one minute you will see a new build triggered in the [AWS Management Console](https://console.aws.amazon.com/codesuite/codepipeline/pipelines)
+![CodePipeline Running](/images/codepipeline/codepipeline_building.png)
 
-![CodePiepline Running](/images/codepipeline/codepipeline_building.png)
-
-Once the service is built and delivered, run the following command to get the Elastic Load Balancer (ELB) endpoint and open it in a browser.
-If the message is not updated immediately, give Kubernetes some time to deploy the change.
-
-```
-kubectl get services hello-k8s -o wide
-```
-
-{{% notice info %}}
-The EXTERNAL-IP column contains a value that ends with "elb.amazonaws.com" - the full value is the DNS record.
-{{% /notice %}}
+#### Confirm the Change
 
+If you still have the ELB URL open in your browser, refresh to confirm the update. If you need to retrieve the URL again, use `kubectl get services hello-k8s -o wide`
diff --git a/content/codepipeline/cleanup.md b/content/codepipeline/cleanup.md
@@ -5,7 +5,7 @@ weight: 16
 draft: false
 ---
 
-Congratulations on completing the CI/CD with CodePipline module.
+Congratulations on completing the CI/CD with CodePipeline module.
 
 This module is not used in subsequent steps, so you can remove the resources now, or at the end of the workshop.
 
@@ -17,13 +17,13 @@ kubectl delete deployments hello-k8s
 kubectl delete services hello-k8s
 ```
 
-Next, we are going to delete the CloudFormation stack created. Open CloudFormation the [AWS Managemnt Console](https://console.aws.amazon.com/cloudformation).
+Next, we are going to delete the CloudFormation stack created. Open CloudFormation the [AWS Management Console](https://console.aws.amazon.com/cloudformation).
 
 Check the box next to the **eksws-codepipeline** stack, select the **Actions** dropdown menu and then click **Delete stack**:
 
 ![CloudFormation Delete](/images/codepipeline/cloudformation_delete.png)
 
-Now we are going to delete the [ECR respository](https://console.aws.amazon.com/ecs/home#/repositories):
+Now we are going to delete the [ECR repository](https://console.aws.amazon.com/ecs/home#/repositories):
 
 ![ECR Delete](/images/codepipeline/ecr_delete.png)
 
@@ -35,7 +35,7 @@ select the bucket, then empty the bucket and finally delete the bucket:
 Finally, we are going to delete the IAM role created for CodeBuild to permit changes to the EKS cluster:
 
 ```
-aws iam delete-role-policy --role-name EksWorkshopCodeBuilKubectldRole --policy-name eks-describe
+aws iam delete-role-policy --role-name EksWorkshopCodeBuildKubectlRole --policy-name eks-describe
 
-aws iam delete-role --role-name EksWorkshopCodeBuilKubectldRole
+aws iam delete-role --role-name EksWorkshopCodeBuildKubectlRole
 ```
diff --git a/content/codepipeline/codepipeline.md b/content/codepipeline/codepipeline.md
@@ -56,17 +56,23 @@ For the status of the service, run the following command:
 kubectl describe service hello-k8s
 ```
 
-Once the service is built and delivered, run the following command to get the Elastic Load Balancer (ELB) endpoint and open it in a browser.
+#### Challenge:
+**How can we view our exposed service?**
 
-```
-kubectl get services hello-k8s -o wide
-```
+**HINT:** Which kubectl command will get you the Elastic Load Balancer (ELB) endpoint for this app?
+
+ {{%expand "Expand here to see the solution" %}}
+
+ Once the service is built and delivered, we can run the following command to get the Elastic Load Balancer (ELB) endpoint and open it in a browser.
+ If the message is not updated immediately, give Kubernetes some time to deploy the change.
+
+ ```
+ kubectl get services hello-k8s -o wide
+ ```
 
 {{% notice info %}}
 This service was configured with a [LoadBalancer](https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/) so,
 an [AWS Elastic Load Balancer](https://aws.amazon.com/elasticloadbalancing/) is launched by Kubernetes for the service.
 The EXTERNAL-IP column contains a value that ends with "elb.amazonaws.com" - the full value is the DNS address.
 {{% /notice %}}
-
-
-
+{{% /expand %}}
diff --git a/content/codepipeline/configmap.md b/content/codepipeline/configmap.md
@@ -13,7 +13,7 @@ Once the ConfigMap includes this new role, kubectl in the CodeBuild stage of the
 ```
 ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
 
-ROLE="    - rolearn: arn:aws:iam::$ACCOUNT_ID:role/EksWorkshopCodeBuilKubectldRole\n      username: build\n      groups:\n        - system:masters"
+ROLE="    - rolearn: arn:aws:iam::$ACCOUNT_ID:role/EksWorkshopCodeBuildKubectlRole\n      username: build\n      groups:\n        - system:masters"
 
 kubectl get -n kube-system configmap/aws-auth -o yaml | awk "/mapRoles: \|/{print;print \"$ROLE\";next}1" > /tmp/aws-auth-patch.yml
 
diff --git a/content/codepipeline/role.md b/content/codepipeline/role.md
@@ -23,7 +23,7 @@ TRUST="{ \"Version\": \"2012-10-17\", \"Statement\": [ { \"Effect\": \"Allow\",
 
 echo '{ "Version": "2012-10-17", "Statement": [ { "Effect": "Allow", "Action": "eks:Describe*", "Resource": "*" } ] }' > /tmp/iam-role-policy
 
-aws iam create-role --role-name EksWorkshopCodeBuilKubectldRole --assume-role-policy-document "$TRUST" --output text --query 'Role.Arn'
+aws iam create-role --role-name EksWorkshopCodeBuildKubectlRole --assume-role-policy-document "$TRUST" --output text --query 'Role.Arn'
 
-aws iam put-role-policy --role-name EksWorkshopCodeBuilKubectldRole --policy-name eks-describe --policy-document file:///tmp/iam-role-policy
+aws iam put-role-policy --role-name EksWorkshopCodeBuildKubectlRole --policy-name eks-describe --policy-document file:///tmp/iam-role-policy
 ```
diff --git a/layouts/shortcodes/cf-launch.html b/layouts/shortcodes/cf-launch.html
@@ -1,5 +1,5 @@
 <a
-  href="https://console.aws.amazon.com/cloudformation/home?#/stacks/quickcreate?stackName={{ .Get 1 }}&templateURL=https://s3.amazonaws.com/{{ $.Site.Params.template_bucket  }}/templates/{{ $.Site.Params.branch  }}/{{ .Get 0 }}"
+href="https://console.aws.amazon.com/cloudformation/home?#/stacks/quickcreate?stackName={{ .Get 1 }}&templateURL=https://s3.amazonaws.com/{{ $.Site.Params.template_bucket  }}/templates/{{ $.Site.Params.branch  }}/{{ .Get 0 }}"
 target="_blank" class="btn btn-default">
 <i class="fas fa-cloud-upload-alt"></i>
 Launch
