Merge pull request #1 from aws-samples/master

Update my fork

Author: nathanpeck

.gitignore

@@ -3,4 +3,7 @@
 **/target
 **/.idea
 **/dependency-reduced-pom.xml
-
+**/journal.json
+**/chaostoolkit.log
+03-path-application-development/306-app-management-with-helm/sample/*.tgz
+03-path-application-development/309-deploying-a-chart-repository/sample/*.tgz

01-path-basics/102-your-first-cluster/readme.adoc

@@ -8,7 +8,7 @@ This section will walk you through how to install a Kubernetes cluster on AWS us
 
 https://github.com/kubernetes/kops[kops, window="_blank"], short for Kubernetes Operations, is a set of tools for installing, operating, and deleting Kubernetes clusters. kops can also perform rolling upgrades from older versions of Kubernetes to newer ones, and manage the cluster add-ons.
 
-If you have not set up the link:../101-start-here[Cloud9 Devlopment Environment, window="_blank"] yet, please do so before continuing.
+If you have not set up the link:../101-start-here[Cloud9 Development Environment, window="_blank"] yet, please do so before continuing.
 
 == Create a Kubernetes Cluster with kops
 
@@ -248,6 +248,7 @@ Save the changes and exit the editor. Kubernetes cluster needs to re-read the co
 
 NOTE: This process can easily take 30-45 minutes. Its recommended to leave the cluster without any updates during that time.
 
+  $ kops update cluster --yes
   $ kops rolling-update cluster --yes
   Using cluster from kubectl context: example.cluster.k8s.local
 

01-path-basics/103-kubernetes-concepts/readme.adoc

@@ -369,7 +369,7 @@ Kubernetes assigns one of the QoS classes to the Pod:
 
 QoS class is used by Kubernetes for scheduling and evicting Pods.
 
-When every Container in a Pod is given a memory and CPU limit, and optionally non-zero request, and they exactly match, then a Pod is scheduled with `Guaranteed` QoS. This is the higest priority.
+When every Container in a Pod is given a memory and CPU limit, and optionally non-zero request, and they exactly match, then a Pod is scheduled with `Guaranteed` QoS. This is the highest priority.
 
 A Pod is given `Burstable` QoS class if the Pod does not meet the `Guaranteed` QoS and at least one Container has a memory or CPU request. This is intermediate priority.
 
@@ -861,7 +861,7 @@ Run the following command to create the service:
 Get more details about the service:
 
 ```
-$ kubectl get svc
+$ kubectl get service
 NAME           TYPE           CLUSTER-IP       EXTERNAL-IP        PORT(S)        AGE
 echo-service   LoadBalancer   100.66.161.199   ad0b47976b7fe...   80:30125/TCP   40s
 kubernetes     ClusterIP      100.64.0.1       <none>             443/TCP        1h
@@ -1245,7 +1245,7 @@ A Cron Job is a job that runs on a given schedule, written in Cron format. There
 Here is the job specification:
 
   $ cat cronjob.yaml
-	apiVersion: batch/v2alpha1
+	apiVersion: batch/v1beta1
 	kind: CronJob
 	metadata:
 	  name: hello
@@ -1399,7 +1399,7 @@ No resource limits.
 +
 . Create a Deployment in this new Namespace using a configuration file:
 +
-  $ deployment-namespace.yaml
+  $ cat deployment-namespace.yaml
 	apiVersion: extensions/v1beta1
 	kind: Deployment
 	metadata:
@@ -1446,7 +1446,7 @@ Alternatively, a namespace can be created using `kubectl` as well.
 
 . Create a Deployment:
 
-	$ kubectl -n dev2 apply -f templates/deployment.yaml
+	$ kubectl -n dev2 apply -f deployment.yaml
 	deployment "nginx-deployment-ns" created
 
 . Get Deployments in the newly created Namespace:
@@ -1634,6 +1634,8 @@ Note, how CPU and memory resources have incremented values.
 
 https://github.com/kubernetes/kubernetes/issues/55433[kubernetes#55433] provide more details on how an explicit CPU resource is not needed to create a Pod with ResourceQuota.
 
+$ kubectl delete quota/quota
+$ kubectl delete quota/quota2
 
 You are now ready to continue on with the workshop!
 

01-path-basics/103-kubernetes-concepts/templates/cronjob.yaml

@@ -1,4 +1,4 @@
-apiVersion: batch/v2alpha1
+apiVersion: batch/v1beta1
 kind: CronJob
 metadata:
   name: hello

02-path-working-with-clusters/201-cluster-monitoring/readme.adoc

@@ -47,9 +47,13 @@ If you are using v1.8 or above, deploy the Dashboard using the following command
 
 Dashboard can be seen using the following command:
 
-    kubectl proxy
+    kubectl proxy --address 0.0.0.0 --accept-hosts '.*' --port 8080
 
-Now, Dashboard is accessible at http://localhost:8001/api/v1/namespaces/kube-system/services/https:kubernetes-dashboard:/proxy/.
+Now, Dashboard is accessible via `Preview`, `Preview Running Application` as:
+
+    https://ENVIRONMENT_ID.vfs.cloud9.REGION_ID.amazonaws.com/api/v1/namespaces/kube-system/services/https:kubernetes-dashboard:/proxy/
+
+Where `ENVIRONMENT_ID` is your Cloud9 IDE environment id (you should see it once click the built-in browser address bar) and `REGION_ID` is AWS region id (e.g. us-east-1).
 
 Starting with Kubernetes 1.7, Dashboard supports authentication. Read more about it at https://github.com/kubernetes/dashboard/wiki/Access-control#introduction. We'll use a bearer token for authentication.
 
@@ -122,7 +126,7 @@ Click on `Nodes` to see a textual representation about the nodes running in the
 
 image::monitoring-nodes-before.png[]
 
-Install a Java application as explained in link:../helm[Deploying applications using Kubernetes Helm charts].
+Install a Java application as explained in link:../../03-path-application-development/306-app-management-with-helm[Deploying applications using Kubernetes Helm charts].
 
 Click on `Pods`, again to see a textual representation about the pods running in the cluster:
 
@@ -152,9 +156,9 @@ Execute this command to install Heapster, InfluxDB and Grafana:
   deployment "monitoring-influxdb" created
   service "monitoring-influxdb" created
 
-Heapster is now aggregating metrics from the cAdvisor instances running on each node. This data is stored in an InfluxDB instance running in the cluster. Grafana dashboard, accessible at http://localhost:8001/api/v1/namespaces/kube-system/services/monitoring-grafana/proxy/?orgId=1, now shows the information about the cluster.
+Heapster is now aggregating metrics from the cAdvisor instances running on each node. This data is stored in an InfluxDB instance running in the cluster. Grafana dashboard, accessible at https://ENVIRONMENT_ID.vfs.cloud9.REGION_ID.amazonaws.com/api/v1/namespaces/kube-system/services/monitoring-grafana/proxy/?orgId=1, now shows the information about the cluster.
 
-NOTE: Grafana dashboard will not be available if Kubernetes proxy is not running. If proxy is not running, it can be started with the command `kubectl proxy`.
+NOTE: Grafana dashboard will not be available if Kubernetes proxy is not running. If proxy is not running, it can be started with the command `kubectl proxy --address 0.0.0.0 --accept-hosts '.*' --port 8080`.
 
 === Grafana dashboard
 

02-path-working-with-clusters/202-service-mesh/readme.adoc

@@ -158,6 +158,10 @@ If you haven't already deployed the "`hello-world`" application, deploy it now.
     kubectl apply -f https://raw.githubusercontent.com/linkerd/linkerd-examples/master/\
     k8s-daemonset/k8s/hello-world.yml
 
+Delete the previous linkerd Daemonset, as we're going to update the ConfigMap and install a new one:
+
+    $ kubectl delete ds/l5d
+
 Deploy the linkerd ingress so we can access the application externally.
 
     $ kubectl apply -f https://raw.githubusercontent.com/linkerd/linkerd-examples/master/\
@@ -239,7 +243,7 @@ you'll need to download Istio. Istio can also automatically inject the sidecar;
 https://istio.io/docs/setup/kubernetes/quick-start.html[Istio quick start]
 
     curl -L https://git.io/getLatestIstio | sh -
-    cd istio-0.2.10
+    cd istio-*
     export PATH=$PWD/bin:$PATH
 
 You should now be able to run the `istioctl` CLI

02-path-working-with-clusters/203-cluster-upgrades/readme.adoc

@@ -14,7 +14,7 @@ with 1.6.10 version and perform an automatic rolling upgrade to 1.7.2 using kops
 
 === Create cluster
 
-Review steps to create link:../prereqs.adoc[prereqs] nad make sure `KOPS_STATE_STORE` and `AWS_AVAILABILITY_ZONES` environment variables are set. More details about creating a cluster are at link:../cluster-install[Create Kubernetes cluster using kops].
+Review steps to create link:../prereqs.adoc[prereqs] and make sure `KOPS_STATE_STORE` and `AWS_AVAILABILITY_ZONES` environment variables are set. More details about creating a cluster are at link:../cluster-install[Create Kubernetes cluster using kops].
 
 In this chapter, we'll create a Kubernetes 1.6.10 version cluster as shown:
 

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

@@ -18,7 +18,7 @@ In terms of architecture, Fluentd is deployed as a DaemonSet with the CloudWatch
 
 This chapter uses a cluster with 3 master nodes and 5 worker nodes as described here: link:../cluster-install#multi-master-multi-node-multi-az-gossip-based-cluster[multi-master, multi-node gossip based cluster].
 
-All configuration files for this chapter are in the `cluster-logging` directory. Make sure you change to that directory before giving any commands in this chapter.
+All configuration files for this chapter are in the `02-path-working-with-clusters/204-cluster-logging-with-EFK` directory. Make sure you change to that directory before giving any commands in this chapter.
 
 == Provision an Amazon Elasticsearch cluster
 

02-path-working-with-clusters/204-cluster-logging-with-EFK/templates/fluentd-ds.yaml

@@ -19,7 +19,7 @@ spec:
     spec:
       containers:
       - name: fluentd
-        image: quay.io/coreos/fluentd-kubernetes:v0.12-cloudwatch
+        image: quay.io/coreos/fluentd-kubernetes:v0.12.33-cloudwatch
         imagePullPolicy: Always
         command: ["fluentd", "-c", "/fluentd/etc/fluentd.conf", "-p", "/fluentd/plugins"]
         env:

03-path-application-development/302-app-discovery/readme.adoc

@@ -8,7 +8,7 @@ This chapter shows an example of how different microservices within an applicati
 
 == Prerequisites
 
-This chapter uses a cluster with 3 master nodes and 5 worker nodes as described here: link:../cluster-install#multi-master-multi-node-multi-az-gossip-based-cluster[multi-master, multi-node gossip based cluster].
+This chapter uses a cluster with 3 master nodes and 5 worker nodes as described here: link:../../01-path-basics/102-your-first-cluster#multi-master-cluster[multi-master cluster].
 
 All configuration files for this chapter are in the `microservices` directory. Make sure you change to that directory before giving any commands in this chapter.