summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKubernetes Submit Queue <k8s-merge-robot@users.noreply.github.com>2016-10-15 12:17:20 -0700
committerGitHub <noreply@github.com>2016-10-15 12:17:20 -0700
commit44e69106f2a8c7520a92239f81809ce9dbcd8d6c (patch)
tree954d6f22043c5fac168de8e529544828ead83a37
parenta4d315e334d71e1cf501b83b692b879fd65847b9 (diff)
parent4bb3757243ec9251af4bd49803293a6c21a36d66 (diff)
Merge pull request #31368 from vladi-dev/master
Automatic merge from submit-queue Doc: Explain how to use EBS storage on AWS <!-- Thanks for sending a pull request! Here are some tips for you: 1. If this is your first time, read our contributor guidelines https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md and developer guide https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md 2. If you want *faster* PR reviews, read how: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/faster_reviews.md 3. Follow the instructions for writing a release note: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes --> **What this PR does / why we need it**: **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: <!-- Steps to write your release note: 1. Use the release-note-* labels to set the release note state (if you have access) 2. Enter your extended release note in the below block; leaving it blank means using the PR title as the release note. If no release note is required, just write `NONE`. --> ```release-note ```
-rw-r--r--aws_under_the_hood.md3
1 files changed, 3 insertions, 0 deletions
diff --git a/aws_under_the_hood.md b/aws_under_the_hood.md
index 77b18d75..ffbe8b39 100644
--- a/aws_under_the_hood.md
+++ b/aws_under_the_hood.md
@@ -94,6 +94,9 @@ often faster, and historically more reliable. Unless you can make do with
whatever space is left on your root partition, you must choose an instance type
that provides you with sufficient instance storage for your needs.
+To configure Kubernetes to use EBS storage, pass the environment variable
+`KUBE_AWS_STORAGE=ebs` to kube-up.
+
Note: The master uses a persistent volume ([etcd](architecture.md#etcd)) to
track its state. Similar to nodes, containers are mostly run against instance
storage, except that we repoint some important data onto the persistent volume.