Merge branch 'master' into release-1.9

This commit is contained in:
zacharysarah
2017-12-15 13:11:00 -06:00
13 changed files with 273 additions and 122 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
id: node
name: Node
full-link: /docs/concepts/architecture/node
full-link: /docs/concepts/architecture/nodes/
aka:
- Minion
related:
+13
View File
@@ -0,0 +1,13 @@
id: replica-set
name: ReplicaSet
full-link: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/
related:
- replication-controller
tags:
- core-object
- architecture
short-description: >
ReplicaSet is the next-generation Replication Controller.
long-description: >
ReplicaSet, like ReplicationController, ensures that a specified number of pods replicas are running at one time.
ReplicaSet supports the new set-based selector requirements as described in the labels user guide, whereas a Replication Controller only supports equality-based selector requirements.
+1 -1
View File
@@ -1,6 +1,6 @@
id: volume
name: Volume
full-link: kubernetes.io/docs/concepts/storage/volumes/
full-link: /docs/concepts/storage/volumes/
related:
- pod
- container
+1 -1
View File
@@ -6,7 +6,7 @@ toc:
- title: Native Tools
section:
- title: Kubectl
path: /docs/user-guide/kubectl/
path: /docs/reference/kubectl/overview/
- title: Kubeadm
path: /docs/getting-started-guides/kubeadm
- title: Kubefed