diff options
| author | Doug Davis <dug@us.ibm.com> | 2016-05-05 13:41:49 -0700 |
|---|---|---|
| committer | Doug Davis <dug@us.ibm.com> | 2016-09-28 10:53:30 -0700 |
| commit | 7a23d7bbd0d1c1b665cc8ebcdd11314e26f27b17 (patch) | |
| tree | 3a1a4e4291fbf47c25228518a8857228c4ffaeec | |
| parent | 7ed7dd3eb37ef2ea95cc49c77a87264e9e7a32a5 (diff) | |
Change minion to node
Contination of #1111
I tried to keep this PR down to just a simple search-n-replace to keep
things simple. I may have gone too far in some spots but its easy to
roll those back if needed.
I avoided renaming `contrib/mesos/pkg/minion` because there's already
a `contrib/mesos/pkg/node` dir and fixing that will require a bit of work
due to a circular import chain that pops up. So I'm saving that for a
follow-on PR.
I rolled back some of this from a previous commit because it just got
to big/messy. Will follow up with additional PRs
Signed-off-by: Doug Davis <dug@us.ibm.com>
| -rw-r--r-- | aws_under_the_hood.md | 14 | ||||
| -rw-r--r-- | event_compression.md | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/aws_under_the_hood.md b/aws_under_the_hood.md index 9702a4fa..77b18d75 100644 --- a/aws_under_the_hood.md +++ b/aws_under_the_hood.md @@ -64,7 +64,7 @@ you manually created or configured your cluster. ### Architecture overview Kubernetes is a cluster of several machines that consists of a Kubernetes -master and a set number of nodes (previously known as 'minions') for which the +master and a set number of nodes (previously known as 'nodes') for which the master which is responsible. See the [Architecture](architecture.md) topic for more details. @@ -161,7 +161,7 @@ Note that we do not automatically open NodePort services in the AWS firewall NodePort services are more of a building block for things like inter-cluster services or for LoadBalancer. To consume a NodePort service externally, you will likely have to open the port in the node security group -(`kubernetes-minion-<clusterid>`). +(`kubernetes-node-<clusterid>`). For SSL support, starting with 1.3 two annotations can be added to a service: @@ -194,7 +194,7 @@ modifying the headers. kube-proxy sets up two IAM roles, one for the master called [kubernetes-master](../../cluster/aws/templates/iam/kubernetes-master-policy.json) and one for the nodes called -[kubernetes-minion](../../cluster/aws/templates/iam/kubernetes-minion-policy.json). +[kubernetes-node](../../cluster/aws/templates/iam/kubernetes-minion-policy.json). The master is responsible for creating ELBs and configuring them, as well as setting up advanced VPC routing. Currently it has blanket permissions on EC2, @@ -242,7 +242,7 @@ HTTP URLs are passed to instances; this is how Kubernetes code gets onto the machines. * Creates two IAM profiles based on templates in [cluster/aws/templates/iam](../../cluster/aws/templates/iam/): * `kubernetes-master` is used by the master. - * `kubernetes-minion` is used by nodes. + * `kubernetes-node` is used by nodes. * Creates an AWS SSH key named `kubernetes-<fingerprint>`. Fingerprint here is the OpenSSH key fingerprint, so that multiple users can run the script with different keys and their keys will not collide (with near-certainty). It will @@ -265,7 +265,7 @@ The debate is open here, where cluster-per-AZ is discussed as more robust but cross-AZ-clusters are more convenient. * Associates the subnet to the route table * Creates security groups for the master (`kubernetes-master-<clusterid>`) -and the nodes (`kubernetes-minion-<clusterid>`). +and the nodes (`kubernetes-node-<clusterid>`). * Configures security groups so that masters and nodes can communicate. This includes intercommunication between masters and nodes, opening SSH publicly for both masters and nodes, and opening port 443 on the master for the HTTPS @@ -281,8 +281,8 @@ information that must be passed in this way. routing rule for the internal network range (`MASTER_IP_RANGE`, defaults to 10.246.0.0/24). * 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 +The name for both is <*KUBE_AWS_INSTANCE_PREFIX*>-node-group. The default +name is kubernetes-node-group. The auto-scaling group has a min and max size 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 diff --git a/event_compression.md b/event_compression.md index 738c3a1c..bbac945a 100644 --- a/event_compression.md +++ b/event_compression.md @@ -170,10 +170,10 @@ Sample kubectl output: ```console FIRSTSEEN LASTSEEN COUNT NAME KIND SUBOBJECT REASON SOURCE MESSAGE -Thu, 12 Feb 2015 01:13:02 +0000 Thu, 12 Feb 2015 01:13:02 +0000 1 kubernetes-node-4.c.saad-dev-vms.internal Minion starting {kubelet kubernetes-node-4.c.saad-dev-vms.internal} Starting kubelet. -Thu, 12 Feb 2015 01:13:09 +0000 Thu, 12 Feb 2015 01:13:09 +0000 1 kubernetes-node-1.c.saad-dev-vms.internal Minion starting {kubelet kubernetes-node-1.c.saad-dev-vms.internal} Starting kubelet. -Thu, 12 Feb 2015 01:13:09 +0000 Thu, 12 Feb 2015 01:13:09 +0000 1 kubernetes-node-3.c.saad-dev-vms.internal Minion starting {kubelet kubernetes-node-3.c.saad-dev-vms.internal} Starting kubelet. -Thu, 12 Feb 2015 01:13:09 +0000 Thu, 12 Feb 2015 01:13:09 +0000 1 kubernetes-node-2.c.saad-dev-vms.internal Minion starting {kubelet kubernetes-node-2.c.saad-dev-vms.internal} Starting kubelet. +Thu, 12 Feb 2015 01:13:02 +0000 Thu, 12 Feb 2015 01:13:02 +0000 1 kubernetes-node-4.c.saad-dev-vms.internal Node starting {kubelet kubernetes-node-4.c.saad-dev-vms.internal} Starting kubelet. +Thu, 12 Feb 2015 01:13:09 +0000 Thu, 12 Feb 2015 01:13:09 +0000 1 kubernetes-node-1.c.saad-dev-vms.internal Node starting {kubelet kubernetes-node-1.c.saad-dev-vms.internal} Starting kubelet. +Thu, 12 Feb 2015 01:13:09 +0000 Thu, 12 Feb 2015 01:13:09 +0000 1 kubernetes-node-3.c.saad-dev-vms.internal Node starting {kubelet kubernetes-node-3.c.saad-dev-vms.internal} Starting kubelet. +Thu, 12 Feb 2015 01:13:09 +0000 Thu, 12 Feb 2015 01:13:09 +0000 1 kubernetes-node-2.c.saad-dev-vms.internal Node starting {kubelet kubernetes-node-2.c.saad-dev-vms.internal} Starting kubelet. Thu, 12 Feb 2015 01:13:05 +0000 Thu, 12 Feb 2015 01:13:12 +0000 4 monitoring-influx-grafana-controller-0133o Pod failedScheduling {scheduler } Error scheduling: no nodes available to schedule pods Thu, 12 Feb 2015 01:13:05 +0000 Thu, 12 Feb 2015 01:13:12 +0000 4 elasticsearch-logging-controller-fplln Pod failedScheduling {scheduler } Error scheduling: no nodes available to schedule pods Thu, 12 Feb 2015 01:13:05 +0000 Thu, 12 Feb 2015 01:13:12 +0000 4 kibana-logging-controller-gziey Pod failedScheduling {scheduler } Error scheduling: no nodes available to schedule pods |
