summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authork8s-merge-robot <k8s.production.user@gmail.com>2015-11-26 05:02:44 -0800
committerk8s-merge-robot <k8s.production.user@gmail.com>2015-11-26 05:02:44 -0800
commit434794adbf734a7e7d340346287c674e10f18ad1 (patch)
tree9c3c5e4a953a8b222a1a0f1b99b622b8cc30f5e9
parent7c869b4d00b438bccece82d38ba3f13570ee8877 (diff)
parent2a9c9d4c4984dde0acebbef17383e26a20be1312 (diff)
Merge pull request #17601 from eosrei/shell-var-MINION-to-NODE
Auto commit by PR queue bot
-rw-r--r--aws_under_the_hood.md2
-rw-r--r--networking.md6
2 files changed, 4 insertions, 4 deletions
diff --git a/aws_under_the_hood.md b/aws_under_the_hood.md
index 9fe46d6f..a55c09e3 100644
--- a/aws_under_the_hood.md
+++ b/aws_under_the_hood.md
@@ -250,7 +250,7 @@ cross-AZ-clusters are more convenient.
* For auto-scaling, on each nodes it creates a launch configuration and group.
The name for both is <*KUBE_AWS_INSTANCE_PREFIX*>-minion-group. The default
name is kubernetes-minion-group. The auto-scaling group has a min and max size
- that are both set to NUM_MINIONS. You can change the size of the auto-scaling
+ that are both set to NUM_NODES. You can change the size of the auto-scaling
group to add or remove the total number of nodes from within the AWS API or
Console. Each nodes self-configures, meaning that they come up; run Salt with
the stored configuration; connect to the master; are assigned an internal CIDR;
diff --git a/networking.md b/networking.md
index 56009d5b..b110ca75 100644
--- a/networking.md
+++ b/networking.md
@@ -132,11 +132,11 @@ differentiate it from `docker0`) is set up outside of Docker proper.
Example of GCE's advanced routing rules:
```sh
-gcloud compute routes add "${MINION_NAMES[$i]}" \
+gcloud compute routes add "${NODE_NAMES[$i]}" \
--project "${PROJECT}" \
- --destination-range "${MINION_IP_RANGES[$i]}" \
+ --destination-range "${NODE_IP_RANGES[$i]}" \
--network "${NETWORK}" \
- --next-hop-instance "${MINION_NAMES[$i]}" \
+ --next-hop-instance "${NODE_NAMES[$i]}" \
--next-hop-instance-zone "${ZONE}" &
```