Merge pull request kubernetes#9098 from benmccann/vault-keywhiz-docs

Document how a secrets server like Vault or Keywhiz might fit into Kubernetes
nikhiljindal · Jun 18, 2015 · 968156e · 968156e
2 parents 9da215e + d7efc88
commit 968156e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/docs/design/secrets.md b/docs/design/secrets.md
@@ -147,7 +147,8 @@ have different preferences for the central store of secret data.  Some possibili
 
 1.  An etcd collection alongside the storage for other API resources
 2.  A collocated [HSM](http://en.wikipedia.org/wiki/Hardware_security_module)
-3.  An external datastore such as an external etcd, RDBMS, etc.
+3.  A secrets server like [Vault](https://www.vaultproject.io/) or [Keywhiz](https://square.github.io/keywhiz/)
+4.  An external datastore such as an external etcd, RDBMS, etc.
 
 #### Size limit for secrets