From 552d73d6492f118353d8ab987c97307aaaec0f80 Mon Sep 17 00:00:00 2001
From: Seth Pellegrino <spellegrino@newrelic.com>
Date: Fri, 21 Jun 2019 12:04:22 -0700
Subject: [PATCH 1/2] docs: update readme

Also changes the sample to use `controlplane` to match what the manager
is looking for.
---
 README.md                    | 22 +++++++++++++++-------
 examples/simple-cluster.yaml |  2 +-
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index a0a196745978..ad1238ea0306 100644
--- a/README.md
+++ b/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.30.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`
 
diff --git a/examples/simple-cluster.yaml b/examples/simple-cluster.yaml
index a95eccf4aad3..8987cf977d87 100644
--- a/examples/simple-cluster.yaml
+++ b/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: {}
 ---

From a65a24004429464e03cac4c29179ae7df36358aa Mon Sep 17 00:00:00 2001
From: sethp-nr <30441101+sethp-nr@users.noreply.github.com>
Date: Fri, 21 Jun 2019 14:06:50 -0700
Subject: [PATCH 2/2] docs: kind >0.3.0

Not 0.30.0

Co-Authored-By: Chuck Ha <ha.chuck@gmail.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ad1238ea0306..902cf04229e2 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ docker build -t my-repository/capd-manager:latest .
 
 Tested on: Linux, OS X
 
-Requirements: `kind` > 0.30.0 and `kubectl`
+Requirements: `kind` > 0.3.0 and `kubectl`
 
 Install capdctl