Merge branch 'master' into release-1.8

2017-08-22 13:03:47 -07:00
parent f5cddc78dd 106ec5c826
commit 6c68762cef
26 changed files with 96 additions and 331 deletions
@@ -137,7 +137,7 @@ program to retrieve the contents of your secret.
 4. Verify the secret is correctly decrypted when retrieved via the API:

    ```
-    kubectl describe secret generic -n default
+    kubectl describe secret secret1 -n default
    ```

    should match `mykey: mydata`