From d43299e48e779a6afe23ecd23df6b2e9477779e8 Mon Sep 17 00:00:00 2001 From: RichieEscarez Date: Tue, 16 Jun 2015 14:48:51 -0700 Subject: [PATCH] Qualified all references to "controller" so that references to "replication controller" are clear. fixes #9404 Also ran hacks/run-gendocs.sh --- cassandra/README.md | 4 ++-- update-demo/README.md | 6 +++--- walkthrough/replication-controller.yaml | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cassandra/README.md b/cassandra/README.md index 605ad910..1ddf01f2 100644 --- a/cassandra/README.md +++ b/cassandra/README.md @@ -131,7 +131,7 @@ Of course, a single node cluster isn't particularly interesting. The real power In Kubernetes a _[Replication Controller](../../docs/replication-controller.md)_ is responsible for replicating sets of identical pods. Like a _Service_ it has a selector query which identifies the members of it's set. Unlike a _Service_ it also has a desired number of replicas, and it will create or delete _Pods_ to ensure that the number of _Pods_ matches up with it's desired state. -Replication Controllers will "adopt" existing pods that match their selector query, so let's create a Replication Controller with a single replica to adopt our existing Cassandra Pod. +Replication controllers will "adopt" existing pods that match their selector query, so let's create a replication controller with a single replica to adopt our existing Cassandra pod. ```yaml apiVersion: v1beta3 @@ -177,7 +177,7 @@ spec: emptyDir: {} ``` -The bulk of the replication controller config is actually identical to the Cassandra pod declaration above, it simply gives the controller a recipe to use when creating new pods. The other parts are the ```replicaSelector``` which contains the controller's selector query, and the ```replicas``` parameter which specifies the desired number of replicas, in this case 1. +Most of this replication controller definition is identical to the Cassandra pod definition above, it simply gives the resplication controller a recipe to use when it creates new Cassandra pods. The other differentiating parts are the ```selector``` attribute which contains the controller's selector query, and the ```replicas``` attribute which specifies the desired number of replicas, in this case 1. Create this controller: diff --git a/update-demo/README.md b/update-demo/README.md index bb694a7c..ffca9bb1 100644 --- a/update-demo/README.md +++ b/update-demo/README.md @@ -38,7 +38,7 @@ I0218 15:18:31.623279 67480 proxy.go:36] Starting to serve on localhost:8001 Now visit the the [demo website](http://localhost:8001/static). You won't see anything much quite yet. -### Step Two: Run the controller +### Step Two: Run the replication controller Now we will turn up two replicas of an image. They all serve on internal port 80. ```bash @@ -47,7 +47,7 @@ $ ./kubectl create -f examples/update-demo/nautilus-rc.yaml After pulling the image from the Docker Hub to your worker nodes (which may take a minute or so) you'll see a couple of squares in the UI detailing the pods that are running along with the image that they are serving up. A cute little nautilus. -### Step Three: Try scaling the controller +### Step Three: Try scaling the replication controller Now we will increase the number of replicas from two to four: @@ -76,7 +76,7 @@ Watch the [demo website](http://localhost:8001/static/index.html), it will updat $ ./kubectl stop rc update-demo-kitten ``` -This will first 'stop' the replication controller by turning the target number of replicas to 0. It'll then delete that controller. +This first stops the replication controller by turning the target number of replicas to 0 and then deletes the controller. ### Step Six: Cleanup diff --git a/walkthrough/replication-controller.yaml b/walkthrough/replication-controller.yaml index 1098a6bf..013a7a04 100644 --- a/walkthrough/replication-controller.yaml +++ b/walkthrough/replication-controller.yaml @@ -4,11 +4,11 @@ metadata: name: nginx-controller spec: replicas: 2 - # selector identifies the set of Pods that this - # replicaController is responsible for managing + # selector identifies the set of pods that this + # replication controller is responsible for managing selector: name: nginx - # podTemplate defines the 'cookie cutter' used for creating + # template defines the 'cookie cutter' used for creating # new pods when necessary template: metadata: