diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2017-09-25 16:50:21 +0200 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2017-09-25 16:55:52 +0200 |
| commit | f6a69ea9f30ba06ff800a9a1d338d75a4fa85c10 (patch) | |
| tree | c5f95d37c79676ade7850000df53dd2f0b4f9636 | |
| parent | 3269588858f8248f528da4ccebfd4bec834518d6 (diff) | |
| download | gitlab-ce-f6a69ea9f30ba06ff800a9a1d338d75a4fa85c10.tar.gz | |
Add link to NGINX Ingress and change Auto DevOps descriptiondocs/k8s
| -rw-r--r-- | doc/user/project/integrations/kubernetes.md | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/doc/user/project/integrations/kubernetes.md b/doc/user/project/integrations/kubernetes.md index a92426fa0fc..7f3a000127f 100644 --- a/doc/user/project/integrations/kubernetes.md +++ b/doc/user/project/integrations/kubernetes.md @@ -53,20 +53,21 @@ The Kubernetes service takes the following parameters: ## Deployment variables -The Kubernetes service exposes following +The Kubernetes service exposes the following [deployment variables](../../../ci/variables/README.md#deployment-variables) in the -GitLab CI build environment: +GitLab CI/CD build environment: -- `KUBE_URL` - equal to the API URL -- `KUBE_TOKEN` +- `KUBE_URL` - Equal to the API URL. +- `KUBE_TOKEN` - The Kubernetes token. - `KUBE_NAMESPACE` - The Kubernetes namespace is auto-generated if not specified. The default value is `<project_name>-<project_id>`. You can overwrite it to use different one if needed, otherwise the `KUBE_NAMESPACE` variable will receive the default value. -- `KUBE_CA_PEM_FILE` - only present if a custom CA bundle was specified. Path +- `KUBE_CA_PEM_FILE` - Only present if a custom CA bundle was specified. Path to a file containing PEM data. -- `KUBE_CA_PEM` (deprecated)- only if a custom CA bundle was specified. Raw PEM data. -- `KUBECONFIG` - Path to a file containing kubeconfig for this deployment. CA bundle would be embedded if specified. +- `KUBE_CA_PEM` (deprecated) - Only if a custom CA bundle was specified. Raw PEM data. +- `KUBECONFIG` - Path to a file containing `kubeconfig` for this deployment. + CA bundle would be embedded if specified. ## What you can get with the Kubernetes integration @@ -97,20 +98,19 @@ the need to leave GitLab. ### Kubernetes monitoring Automatically detect and monitor Kubernetes metrics. Automatic monitoring of -NGINX ingress is also supported. +[NGINX ingress](./prometheus_library/nginx.md) is also supported. [> Read more about Kubernetes monitoring](./prometheus_library/kubernetes.md) ### Auto DevOps -Auto DevOps brings best practices to your project in an easy and default way. -A typical web project starts with Continuous Integration (CI), then adds -automated deployment to production, and maybe some time in the future adds some -kind of monitoring. With Auto DevOps, every project has a complete workflow, -with no configuration, including: **Auto Build**, **Auto Test**, **Auto Code Quality**, -**Auto Review Apps**, **Auto Deploy**, and **Auto Monitoring**. +Auto DevOps automatically detects, builds, tests, deploys, and monitors your +applications. -[> Read more about Auto DevOps](../../../topics/autodevops/index.md). +To make full use of Auto DevOps(Auto Deploy, Auto Review Apps, and Auto Monitoring) +you will need the Kubernetes project integration enabled. + +[> Read more about Auto DevOps](../../../topics/autodevops/index.md) ### Web terminals |