@@ -1,6 +1,6 @@

 #Photon OS on GCE

 ## Google Compute Engine (GCE) Image background

-GCE is a service that lets you run virtual machines on Google's infrastructure. You can customize the virtual machine as much as you want, and you can even install your own custom operating system image. Or, you can adopt one of the public [images](https://cloud.google.com/compute/docs/operating-systems/) provided by Google. For any operating system to work with GCE, it must match the Google's infrastructure needs. 

+GCE is a service that lets you run virtual machines on Google's infrastructure. You can customize the virtual machine as much as you want, and you can even install your own custom operating system image. Or, you can adopt one of the public [images](https://cloud.google.com/compute/docs/operating-systems/) provided by Google. For any operating system to work with GCE, it must match Google's infrastructure needs. 

 Google provides tools that VM instances require to work correctly on GCE:

  *   __[Google startup scripts](https://cloud.google.com/compute/docs/startupscript)__: User can provide some startup script to configure their instances at startup.

@@ -1,8 +1,6 @@

-Running Kubernetes on Photon

+Running Kubernetes on Photon OS

 -----------------------------------------------------

-(Note: Modified Getting started Kubernetes docs accordingly to run Kubernetes on Photon)

-

 **Table of Contents**

 - [Prerequisites](#prerequisites)

@@ -10,15 +8,15 @@ Running Kubernetes on Photon

 ## Prerequisites

-1. You need 2 or more machines with Photon installed.

+* You need 2 or more machines with Photon installed.

 ## Instructions

-This is a getting started guide for Photon.  It is a manual configuration so you understand all the underlying packages / services / ports, etc...

+This document gets you started using Kubernetes with Photon OS. The instructions present a manual configuration that gets one worker node running to help you understand  the underlying packages, services, ports, and so forth. 

-This guide will only get ONE node (previously minion) working.  

+The Kubernetes package provides several services: kube-apiserver, kube-scheduler, kube-controller-manager, kubelet, kube-proxy.  These services are managed by systemd. Their configuration resides in a central location: /etc/kubernetes.  

-The Kubernetes package provides a few services: kube-apiserver, kube-scheduler, kube-controller-manager, kubelet, kube-proxy.  These services are managed by systemd and the configuration resides in a central location: /etc/kubernetes.  We will break the services up between the hosts.  The first host, photon-master, will be the Kubernetes master.  This host will run the kube-apiserver, kube-controller-manager, and kube-scheduler.  In addition, the master will also run _etcd_ (not needed if _etcd_ runs on a different host but this guide assumes that _etcd_ and Kubernetes master run on the same host).  The remaining host, photon-node will be the node and run kubelet, proxy and docker.

+The following instructions break the services up between the hosts.  The first host, photon-master, will be the Kubernetes master.  This host will run the kube-apiserver, kube-controller-manager, and kube-scheduler.  In addition, the master will also run _etcd_ (not needed if _etcd_ runs on a different host but this guide assumes that _etcd_ and Kubernetes master run on the same host).  The remaining host, photon-node will be the node and run kubelet, proxy and docker.

 **System Information:**

@@ -62,7 +60,7 @@ echo "192.168.121.9	photon-master

 # Comma separated list of nodes in the etcd cluster

 KUBE_MASTER="--master=http://photon-master:8080"

-# logging to stderr means we get it in the systemd journal

+# logging to stderr routes it to the systemd journal

 KUBE_LOGTOSTDERR="--logtostderr=true"

 # journal message level, 0 is debug

@@ -86,7 +84,7 @@ KUBE_ETCD_SERVERS="--etcd_servers=http://127.0.0.1:4001"

 # Address range to use for services

 KUBE_SERVICE_ADDRESSES="--service-cluster-ip-range=10.254.0.0/16"

-# Add your own!

+# Add your own

 KUBE_API_ARGS=""

 ```

@@ -153,7 +151,7 @@ KUBELET_HOSTNAME="--hostname_override=photon-node"

 # location of the api-server

 KUBELET_API_SERVER="--api_servers=http://photon-master:8080"

-# Add your own!

+# Add your own

 #KUBELET_ARGS=""

 ```

@@ -183,9 +181,10 @@ To delete _photon-node_ from your Kubernetes cluster, one should run the followi

 kubectl delete -f ./node.json

 ```

-*You should be finished!*

+*You should be finished.*

+

+**The cluster should be running. Launch a test pod.**

-**The cluster should be running! Launch a test pod.**

+You should have a functional cluster. Check out [101](https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/user-guide/walkthrough/README.md).

-You should have a functional cluster, check out [101](https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/user-guide/walkthrough/README.md)!

@@ -1,23 +1,24 @@

-Running Rocket containers on Photon

-===================================

+Running Rocket Containers on Photon OS

+======================================

-Rocket is a new container runtime, created by [CoreOS](http://coreos.com) and designed for composability, security, and speed. 

+Rocket is a container runtime created by [CoreOS](http://coreos.com). It is designed for composability, security, and speed. 

-rkt (pronounced _"rock-it"_) is a CLI for running app containers, and an implementation of the [App Container Spec](https://github.com/coreos/rkt/blob/master/Documentation/app-container.md).

+A command-line interface for running application containers, rkt (pronounced _"rock-it"_) implements the [App Container Spec](https://github.com/coreos/rkt/blob/master/Documentation/app-container.md).

-rkt is available as an optional package in Photon, to install it:

+The rkt package is installed by default in the full version of Photon OS. In the minimal version, rkt is an optional package. You can install it by running the following commands as root:

 ```

-mount /dev/cdrom /media/cdrom

-

 tdnf install rocket

 ```

-### Running an App Container Image (ACI)

+For more information about the tdnf command, see the [Photon OS Administration Guide](https://github.com/vmware/photon/blob/master/docs/photon-admin-guide.md).

+

-rkt uses content addressable storage (CAS) for storing an ACI on disk. In this example, the image is downloaded and added to the CAS.

+### Running an App Container Image

-Since rkt verifies signatures by default, you will need to first [trust](https://github.com/coreos/rkt/blob/master/Documentation/signing-and-verification-guide.md#establishing-trust) the [CoreOS public key](https://coreos.com/dist/pubkeys/aci-pubkeys.gpg) used to sign the image:

+rkt uses content addressable storage (CAS) for storing an app container image (ACI) on disk. In the following example, the image is downloaded and added to the CAS.

+

+Since rkt verifies signatures by default, you need to first [trust](https://github.com/coreos/rkt/blob/master/Documentation/signing-and-verification-guide.md#establishing-trust) the [CoreOS public key](https://coreos.com/dist/pubkeys/aci-pubkeys.gpg) used to sign the image:

 ```

 $ sudo rkt trust --prefix coreos.com/etcd

@@ -30,7 +31,7 @@ Trusting "https://coreos.com/dist/pubkeys/aci-pubkeys.gpg" for prefix "coreos.co

 Added key for prefix "coreos.com/etcd" at "/etc/rkt/trustedkeys/prefix.d/coreos.com/etcd/8b86de38890ddb7291867b025210bd8888182190"

 ```

-Now that we've trusted the CoreOS public key, we can bring up a simple etcd instance using the ACI format:

+Now that you have trusted the CoreOS public key, you can bring up a simple etcd instance using the ACI format:

 ```

 $ privateIp=$(ip -4 -o addr show eth0 | cut -d' ' -f7 | cut -d'/' -f1)

@@ -74,4 +75,5 @@ Timezone UTC does not exist in container, not updating container timezone.

 2015/04/02 13:18:41 etcdserver: published {Name:vmware-cna ClientURLs:[http://192.168.35.246:2379]} to cluster 75c533bd1f49730b

 ```

-At any time you can press ^] three times to kill container.

\ No newline at end of file

+When you are done, press the `^]` key three times to kill the container. To generate `^]` on a U.S. keyboard, type Ctrl+] (hold down the Ctrl key and then press the `]` key). The key combination to generate the `^]` escape character might differ on keyboard layouts other than the U.S. keyboard. 

+