diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-28 03:06:27 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-28 03:06:27 +0000 |
| commit | a87b80f74416208b8c46db328c5384d7ccbdecdd (patch) | |
| tree | d9c14eb0cbbcde66690582857f459ada0ddb98ed | |
| parent | 352012d8484cf0d7d5d976ecea7e46b196445709 (diff) | |
| download | gitlab-ce-a87b80f74416208b8c46db328c5384d7ccbdecdd.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
| -rw-r--r-- | doc/ci/variables/deprecated_variables.md | 12 | ||||
| -rw-r--r-- | doc/user/project/clusters/index.md | 10 |
2 files changed, 13 insertions, 9 deletions
diff --git a/doc/ci/variables/deprecated_variables.md b/doc/ci/variables/deprecated_variables.md index cdca5bf27fc..543da481938 100644 --- a/doc/ci/variables/deprecated_variables.md +++ b/doc/ci/variables/deprecated_variables.md @@ -20,15 +20,15 @@ future GitLab releases.** | 8.x name | 9.0+ name | | --------------------- |------------------------ | +| `CI_BUILD_BEFORE_SHA` | `CI_COMMIT_BEFORE_SHA` | | `CI_BUILD_ID` | `CI_JOB_ID` | +| `CI_BUILD_MANUAL` | `CI_JOB_MANUAL` | +| `CI_BUILD_NAME` | `CI_JOB_NAME` | | `CI_BUILD_REF` | `CI_COMMIT_SHA` | -| `CI_BUILD_TAG` | `CI_COMMIT_TAG` | -| `CI_BUILD_BEFORE_SHA` | `CI_COMMIT_BEFORE_SHA` | | `CI_BUILD_REF_NAME` | `CI_COMMIT_REF_NAME` | | `CI_BUILD_REF_SLUG` | `CI_COMMIT_REF_SLUG` | -| `CI_BUILD_NAME` | `CI_JOB_NAME` | -| `CI_BUILD_STAGE` | `CI_JOB_STAGE` | | `CI_BUILD_REPO` | `CI_REPOSITORY_URL` | -| `CI_BUILD_TRIGGERED` | `CI_PIPELINE_TRIGGERED` | -| `CI_BUILD_MANUAL` | `CI_JOB_MANUAL` | +| `CI_BUILD_STAGE` | `CI_JOB_STAGE` | +| `CI_BUILD_TAG` | `CI_COMMIT_TAG` | | `CI_BUILD_TOKEN` | `CI_JOB_TOKEN` | +| `CI_BUILD_TRIGGERED` | `CI_PIPELINE_TRIGGERED` | diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md index 9ecb785d6fe..26995809d84 100644 --- a/doc/user/project/clusters/index.md +++ b/doc/user/project/clusters/index.md @@ -205,9 +205,13 @@ To add an existing Kubernetes cluster to your project: `default-token-xxxxx`. Copy that token name for use below. - Get the certificate by running this command: - ```sh - kubectl get secret <secret name> -o jsonpath="{['data']['ca\.crt']}" | base64 --decode - ``` + ```sh + kubectl get secret <secret name> -o jsonpath="{['data']['ca\.crt']}" | base64 --decode + ``` + + NOTE: **Note:** + If the command returns the entire certificate chain, you need copy the *root ca* + certificate at the bottom of the chain. - **Token** - GitLab authenticates against Kubernetes using service tokens, which are |