Merge branch 'master' into release-1.8

2017-08-25 10:30:26 -07:00
parent 9403dc361f 44f3acad1e
commit 895a6074e2
34 changed files with 311 additions and 118 deletions
@@ -0,0 +1,12 @@
+- Fundamental
+- API Object
+- Metadata
+- Configuration
+- Security
+- Networking
+- Storage
+- Operation
+- Workload
+- Component
+- API
+- Extension
@@ -1,30 +0,0 @@
-canonical-tags:
- Fundamental
- API Object
- Metadata
- Configuration
- Security
- Networking
- Storage
- Operation
- Workload
- Component
- API
- Extension
-
-# TODO: Add list of glossary terms here
-# (to avoid writing a function that iterates through all glossary term pages)
-# e.g.
-# terms:
-# - name: StatefulSets
-#   tags:
-#   - Storage
-#   - Workload
-#   - API Object
-# - name: Aggregation Layer
-#   tags:
-#   - API
-#   - Component
-#   - Extension
-#
-# See https://github.com/kubernetes/kubernetes.github.io/projects/4 for details.
@@ -0,0 +1,17 @@
+id: _example
+name: Example K8s Term
+formerly:
+- Slang K8s Term
+- Misnomer
+- Formerly Known as Prince
+related:
+- Less Fancy K8s Term
+- Tangential Term
+- Commonly Used With
+tags:
+- Some Tag
+short-description: |
+  Required. One or two lines that provide a minimum definition. Do not repeat the term. Write about the plural of the term. Prefer fragments. Model after tooltips. End with a period.
+long-description: |
+  Optional. Longer additional text to appear after (in conjunction with) short description. Provide where the short description is not sufficient as the intro paragraph to a topic. Write complete but concise sentences.
+  **See /_includes/templates/glossary/README.md for the official style guide.**
@@ -0,0 +1,18 @@
+id: statefulset
+name: StatefulSet
+formerly:
+- PetSet
+related:
+- Deployment
+- Pod
+tags:
+- Storage
+- Workload
+- API Object
+short-description: |
+  Manage the deployment and scaling of a set of Pods, *and provide guarantees about ordering*. They do so by maintaining a *unique*, sticky identity for each of their Pods.
+
+long-description: |
+  Like Deployments, StatefulSets manage Pods that are based on an identical container spec. However, although their specs are the same, the Pods in a StatefulSet are not interchangeable. Each Pod has a persistent identifier that it maintains across any rescheduling.
+
+  StatefulSets also operate according to the Controller pattern. You define your desired state in a StatefulSet *object*, and the StatefulSet *controller* makes any necessary updates to the get there from the current state.