Merge pull request kubernetes-sigs#7 from sethp-nr/docs/update-readme

docs: update readme

README.md

@@ -4,7 +4,7 @@ A temporary home for CAPD
 
 ## Manager Container Image
 
-A sample is built and hosted at `gcr.io/kubernetes1-226021/capd-manager:latest` 
+A sample is built and hosted at `gcr.io/kubernetes1-226021/capd-manager:latest`
 
 ### Building the binaries
 
@@ -19,17 +19,25 @@ Requires `gcloud` authenticated and configured.
 
 Requires a google cloud project
 
-`./scripts/publish-capd-manager.sh`
+`./scripts/publish-manager.sh`
+
+#### Using Docker
+
+Alternatively, replace "my-repository" with an appropriate prefix and run:
+
+```
+docker build -t my-repository/capd-manager:latest .
+```
 
 # Testing out CAPD
 
 Tested on: Linux, OS X
 
-Requirements: `kind` and `kubectl`
+Requirements: `kind` > 0.3.0 and `kubectl`
 
-Install capkctl
+Install capdctl
 
-`go install ./cmd/capkctl`
+`go install ./cmd/capdctl`
 
 Start a management kind cluster
 
@@ -45,7 +53,7 @@ Install the cluster-api CRDs
 
 Run the capd & capi manager
 
-`capdctl capd | kubectl apply -f -`
+`capdctl capd -capd-image=gcr.io/my-project/capd-manager:latest | kubectl apply -f -`
 
 ## Create a worker cluster
 
@@ -56,6 +64,6 @@ Run the capd & capi manager
 The kubeconfig is on the management cluster in secrets. Grab it and write it to a file:
 
 `kubectl get secrets -o jsonpath='{.data.kubeconfig}' kubeconfig-my-cluster | base64 --decode > ~/.kube/kind-config-my-cluster`
- 
+
 `kubectl get po --all-namespaces --kubeconfig ~/.kube/kind-config-my-cluster`
 

examples/simple-cluster.yaml

@@ -16,7 +16,7 @@ metadata:
   name: my-control-plane
   labels:
     cluster.k8s.io/cluster-name: my-cluster
-    set: "control-plane"
+    set: "controlplane"
 spec:
   providerSpec: {}
 ---