Merge pull request aws-samples#270 from mdelagrange/delete-old-iso

arun-gupta · web-flow · commit 50841e6f57d5 · 2017-12-04T20:02:21.000-08:00
add step to delete the old minikube ISO if present
diff --git a/getting-started/readme.adoc b/getting-started/readme.adoc
@@ -83,9 +83,9 @@ Containers:
       /var/run/secrets/kubernetes.io/serviceaccount from default-token-cqht0 (ro)
 Conditions:
   Type           Status
-  Initialized    True 
-  Ready          True 
-  PodScheduled   True 
+  Initialized    True
+  Ready          True
+  PodScheduled   True
 Volumes:
   default-token-cqht0:
     Type:        Secret (a volume populated by a Secret)
@@ -172,20 +172,20 @@ Expose the deployment creates what Kubernetes calls a service. You can see the p
     kubernetes   ClusterIP      100.64.0.1      <none>             443/TCP        2d
     web          NodePort       100.67.45.110   <none>             80:32400/TCP   32s
 
-We will learn more about Services and Deployments later in the workshop.    
+We will learn more about Services and Deployments later in the workshop.
 
 === View the NGiNX deployment using the NodePort
 
-First, we find the hostname of the node on which the nginx Pod is running: 
+First, we find the hostname of the node on which the nginx Pod is running:
 
-    $ kubectl get pods -l="run=nginx" 
+    $ kubectl get pods -l="run=nginx"
     NAME                     READY     STATUS    RESTARTS   AGE
     nginx-4217019353-pmkzb   1/1       Running   0          16m
 
     $ kubectl get pod nginx-4217019353-pmkzb -o=jsonpath={.spec.nodeName}
     ip-172-20-87-91.us-east-2.compute.internal
 
-The `-o` flag allows us to choose a different output format, and choosing the `jsonpath` output format allows us to filter the resultant JSON down to the exact value we need. 
+The `-o` flag allows us to choose a different output format, and choosing the `jsonpath` output format allows us to filter the resultant JSON down to the exact value we need.
 
 Next we need the dynamic port the service opened for us on the node running the NGiNX pod.
 
@@ -200,7 +200,7 @@ Replace the `Values` value with the nodeName retreived earlier.
         [
             "sg-c0285fa8"
         ]
-    ]    
+    ]
 
 Next, we add an ingress rule to the security group opening up the port on the node to anyone - `0.0.0.0/0`. This is purely for demonstration purposes in this workshop and is not a best practice. Most services will be exposed behind a load balancer, which we cover in the next section.  For the command below, replace the `--group-id` parameter with the GroupId you just retrieved, and the `--port` parameter value with the nodePort retreived above.
 
@@ -219,7 +219,7 @@ Finally, we can use the AWS CLI to retrieve the public hostname of the node itse
 
 You should now be able to point a browser or use `cURL` to retrieve the combined <public hostname>:<node port> and see the default NGiNX homepage:
 
-    $ curl http://ec2-18-216-5-70.us-east-2.compute.amazonaws.com:32400 
+    $ curl http://ec2-18-216-5-70.us-east-2.compute.amazonaws.com:32400
     <!DOCTYPE html>
     <html>
     <head>
@@ -240,8 +240,8 @@ You should now be able to point a browser or use `cURL` to retrieve the combined
     <a href="http://nginx.org/">nginx.org</a>.<br/>
     Commercial support is available at
     <a href="http://nginx.com/">nginx.com</a>.</p>
-    <p><em>Thank you for using nginx.</em></p> 
-    
+    <p><em>Thank you for using nginx.</em></p>
+
 == Expose the deployment as a service (via a Load Balancer)
 
 Delete the existing service and deployment:
@@ -303,4 +303,3 @@ Delete all the Kubernetes resources created so far:
 Revoke access on the port you opened on the EC2 security group earlier:
 
     $ aws ec2 revoke-security-group-ingress --group-id sg-c0285fa8 --protocol tcp --port 32400 --cidr 0.0.0.0/0
-
diff --git a/local-development/readme.adoc b/local-development/readme.adoc
@@ -4,16 +4,16 @@
 :imagesdir: ../images
 :toc:
 
-For local development purposes, you can create a one-node cluster using https://github.com/kubernetes/minikube[Minikube]. 
-Hosted solutions or cloud-based solutions provide the scalability and higher availability for staging or production purposes. 
+For local development purposes, you can create a one-node cluster using https://github.com/kubernetes/minikube[Minikube].
+Hosted solutions or cloud-based solutions provide the scalability and higher availability for staging or production purposes.
 A complete list of solutions to create a Kubernetes cluster is explained at http://kubernetes.io/docs/getting-started-guides/.
 
-This section will explain how to create and shutdown a development Kubernetes cluster using Minikube. 
+This section will explain how to create and shutdown a development Kubernetes cluster using Minikube.
 
 == Download and Install
 
-Minikube runs a single-node Kubernetes cluster inside a VM on your laptop. 
-This allows you to easily try out Kubernetes on your local machine. 
+Minikube runs a single-node Kubernetes cluster inside a VM on your laptop.
+This allows you to easily try out Kubernetes on your local machine.
 Minikube packages and configures a Linux VM, the container runtime, and all Kubernetes components - optimized for local development.
 
 Complete installation instructions are available at https://github.com/kubernetes/minikube. Here are quick instructions:
@@ -26,28 +26,42 @@ Provision and install a local Kubernetes cluster on a Mac OS via https://brew.sh
 
     $ brew cask install virtualbox
 
-. Install minikube
-
-    $ brew cask install minikube
+. Install (or update) minikube
++
+*If you've never installed minikube before:*
++
+    brew cask install minikube
++
+Verify the version:
 +
-If `minikube` has already been installed earlier, then you can update the install using the following command:
+    $ minikube version
+    minikube version: v0.24.1
 +
-    $ brew cask reinstall minikube
+*If you already have minikube:*
 +
-If you receive this error after `brew cask install minikube`:
+    brew cask reinstall minikube
 +
+[NOTE]
+====
+If you receive this error:
+
     ==> Installing Cask minikube
     Error: It seems there is already a Binary at '/usr/local/bin/minikube'; not linking.
-+
+
 Run this command:
-+
+
     $ sudo cp ~/Library/Caches/Homebrew/Cask/minikube--0.24.1 /usr/local/bin/minikube
+====
 +
 Verify the version:
-+
+
     $ minikube version
     minikube version: v0.24.1
 +
+Finally delete the previous minikube ISO:
+
+    minikube delete
++
 . Install Kubectl CLI
 
     $ brew install kubernetes-cli
