Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-12-13 22:13:33 +0300
committerAchilleas Pipinellis <axil@gitlab.com>2018-12-13 22:13:33 +0300
commit141e1b2167ee9cc9b51e9becfde6c2e4f5bbae35 (patch)
tree7088375114ffc0ebeebfa20b688cd4b245e49c81 /doc/user/project
parent352fe16265a488360241c46ce65093258b81b41e (diff)
parent837148310f890a80b4c9abfc14f7cda0195a39d6 (diff)
Merge branch 'docs-fix-base64-examples' into 'master'
Fix base64 example to use universal option Closes #55218 See merge request gitlab-org/gitlab-ce!23787
Diffstat (limited to 'doc/user/project')
-rw-r--r--doc/user/project/clusters/eks_and_gitlab/index.md2
-rw-r--r--doc/user/project/clusters/index.md4
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/user/project/clusters/eks_and_gitlab/index.md b/doc/user/project/clusters/eks_and_gitlab/index.md
index fa2ed21f980..0e6d4bce153 100644
--- a/doc/user/project/clusters/eks_and_gitlab/index.md
+++ b/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
diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md
index 95bd5d1cf4e..5d9345fe0e3 100644
--- a/doc/user/project/clusters/index.md
+++ b/doc/user/project/clusters/index.md
@@ -157,8 +157,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