Automatic merge of gitlab-org/gitlab-ce master

doc/administration/operations/filesystem_benchmarking.md

@@ -44,12 +44,10 @@ user	0m0.025s
 sys	0m0.091s
 ```
 
-From experience with multiple customers, the following are ranges that indicate
-whether your filesystem performance is satisfactory or less than ideal:
-
-| Rating    | Benchmark result        |
-|:----------|:------------------------|
-| Best      | Less than 10 seconds    |
-| OK        | 10-18 seconds           |
-| Poor      | 18-25 seconds           |
+From experience with multiple customers, this task should take under 10
+seconds to indicate good filesystem performance. 
+
+NOTE: **Note:**
+This test is naive and only evaluates write performance. It's possible to 
+receive good results on this test but still have poor performance due to read 
+speed and various other factors. 
\ No newline at end of file
-| Very poor | Greater than 25 seconds |

doc/user/project/clusters/eks_and_gitlab/index.md

@@ -49,7 +49,7 @@ A few details from the EKS cluster will be required to connect it to GitLab:
     -  Get the certificate with:
 
        ```sh
-       kubectl get secret <secret name> -o jsonpath="{['data']['ca\.crt']}" | base64 -D
+       kubectl get secret <secret name> -o jsonpath="{['data']['ca\.crt']}" | base64 --decode
        ```
 
 1.  **Create admin token**: A `cluster-admin` token is required to install and

doc/user/project/clusters/index.md

@@ -158,8 +158,8 @@ To determine the:
 - API URL, run `kubectl cluster-info | grep 'Kubernetes master' | awk '/http/ {print $NF}'`.
 - Token:
   1. List the secrets by running: `kubectl get secrets`. Note the name of the secret you need the token for.
-  1. Get the token for the appropriate secret by running: `kubectl get secret <SECRET_NAME> -o jsonpath="{['data']['token']}" | base64 -D`.
-- CA certificate, run `kubectl get secret <secret name> -o jsonpath="{['data']['ca\.crt']}" | base64 -D`.
+  1. Get the token for the appropriate secret by running: `kubectl get secret <SECRET_NAME> -o jsonpath="{['data']['token']}" | base64 --decode`.
+- CA certificate, run `kubectl get secret <secret name> -o jsonpath="{['data']['ca\.crt']}" | base64 --decode`.
 
 ## Security implications