Skip to content

Commit

Permalink
Merge branch 'master' into release-1.9
Browse files Browse the repository at this point in the history
  • Loading branch information
zacharysarah committed Dec 7, 2017
2 parents 07d8458 + 92e0fa1 commit edf3472
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 0 deletions.
10 changes: 10 additions & 0 deletions _data/glossary/kubelet.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
id: kubelet
name: Kubelet
full-link: docs/reference/generated/kubelet
tags:
- fundamental
- core-object
short-description: >
An agent that runs on each node in the cluster. It makes sure that containers are running in a pod.
long-description: >
The kubelet takes a set of PodSpecs that are provided through various mechanisms and ensures that the containers described in those PodSpecs are running and healthy. The kubelet doesn’t manage containers which were not created by Kubernetes.
11 changes: 11 additions & 0 deletions _data/glossary/resource-quota.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
id: resource-quota
name: Resource Quotas
full-link: /docs/concepts/policy/resource-quotas/
tags:
- fundamental
- operation
- architecture
short-description: >
Provides constraints that limit aggregate resource consumption per {% glossary_tooltip term_id="namespace" %}.
long-description: >
Limits the quantity of objects that can be created in a namespace by type, as well as the total amount of compute resources that may be consumed by resources in that project.
15 changes: 15 additions & 0 deletions _data/glossary/secret.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
id: secret
name: Secret
full-link: /docs/concepts/configuration/secret/
related:
- pods
- volume
tags:
- core-object
- security
short-description: >
Stores sensitive information, such as passwords, OAuth tokens, and ssh keys.
long-description: >
Allows for more control over how sensitive information is used and reduces the risk of accidental exposure, including [encryption](https://kubernetes.io/docs/tasks/administer-cluster/encrypt-data/#ensure-all-secrets-are-encrypted) at rest.
A {% glossary_tooltip text="Pod" term_id="pod" %} references the secret as a file in a volume mount or by the kubelet pulling images for a pod.
Secrets are great for confidential data and [ConfigMaps](https://kubernetes.io/docs/tasks/configure-pod-container/configmap/) for non-confidential data.

0 comments on commit edf3472

Please sign in to comment.