From 686b2b262391d20a3530e26d080d9630aaa09bcd Mon Sep 17 00:00:00 2001 From: Evan Read Date: Thu, 25 Jul 2019 10:13:10 +1000 Subject: Update annotation information --- doc/user/project/clusters/index.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md index ae39d377a35..670dde6bb00 100644 --- a/doc/user/project/clusters/index.md +++ b/doc/user/project/clusters/index.md @@ -87,8 +87,14 @@ When enabled, the Kubernetes service adds [web terminal](../../../ci/environment support to your [environments](../../../ci/environments.md). This is based on the `exec` functionality found in Docker and Kubernetes, so you get a new shell session within your existing containers. To use this integration, you should deploy to Kubernetes using -the deployment variables above, ensuring any pods you create are labelled with -`app=$CI_ENVIRONMENT_SLUG`. GitLab will do the rest! +the deployment variables above, ensuring any deployments, replica sets, and +pods are annotated with: + +- `app.gitlab.com/env: $CI_ENVIRONMENT_SLUG` +- `app.gitlab.com/app: $CI_PROJECT_PATH_SLUG` + +`$CI_ENVIRONMENT_SLUG` and `$CI_PROJECT_PATH_SLUG` are the values of +the CI variables. ## Adding and removing clusters -- cgit v1.2.1