diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2019-02-07 16:03:40 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-02-07 16:03:40 +0000 |
| commit | e0ef2376874ef165a3ca4405cf9cfac241302d3f (patch) | |
| tree | caa50b71e4b753a0b175ad6f444ab18cf5fde31c | |
| parent | f4f3f286f1c6bc37133fe775862e7340d7b56f1e (diff) | |
| parent | 1a336b20edd41804ba2ad405477397fb8feb2561 (diff) | |
| download | gitlab-ce-e0ef2376874ef165a3ca4405cf9cfac241302d3f.tar.gz | |
Merge branch 'docs-fixes-cluster-domain-documentation' into 'master'
Fixes Cluster base domain documentation
See merge request gitlab-org/gitlab-ce!25008
| -rw-r--r-- | doc/topics/autodevops/index.md | 6 | ||||
| -rw-r--r-- | doc/user/group/clusters/index.md | 3 | ||||
| -rw-r--r-- | doc/user/project/clusters/index.md | 3 |
3 files changed, 5 insertions, 7 deletions
diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md index 5b6b857dd74..463bdd59282 100644 --- a/doc/topics/autodevops/index.md +++ b/doc/topics/autodevops/index.md @@ -140,8 +140,8 @@ in any of the following places: - or at the group level as a variable: `KUBE_INGRESS_BASE_DOMAIN`. NOTE: **Note** -Auto DevOps base domain variable (`KUBE_INGRESS_BASE_DOMAIN`) follows the same order of precedence -as other environment [varibles](../../ci/variables/README.md#priority-of-variables). +The Auto DevOps base domain variable (`KUBE_INGRESS_BASE_DOMAIN`) follows the same order of precedence +as other environment [variables](../../ci/variables/README.md#priority-of-variables). A wildcard DNS A record matching the base domain(s) is required, for example, given a base domain of `example.com`, you'd need a DNS entry like: @@ -685,7 +685,7 @@ also be customized, and you can easily use a [custom buildpack](#custom-buildpac | **Variable** | **Description** | | ------------ | --------------- | -| `AUTO_DEVOPS_DOMAIN` | The [Auto DevOps domain](#auto-devops-domain). By default, set automatically by the [Auto DevOps setting](#enabling-auto-devops). This variable is deprecated and [is scheduled to be removed](https://gitlab.com/gitlab-org/gitlab-ce/issues/56959) in GitLab 12.0. | +| `AUTO_DEVOPS_DOMAIN` | The [Auto DevOps domain](#auto-devops-domain). By default, set automatically by the [Auto DevOps setting](#enabling-auto-devops). This variable is deprecated and [is scheduled to be removed](https://gitlab.com/gitlab-org/gitlab-ce/issues/56959) in GitLab 12.0. Use `KUBE_INGRESS_BASE_DOMAIN` instead. | | `AUTO_DEVOPS_CHART` | The Helm Chart used to deploy your apps; defaults to the one [provided by GitLab](https://gitlab.com/charts/auto-deploy-app). | | `AUTO_DEVOPS_CHART_REPOSITORY` | The Helm Chart repository used to search for charts; defaults to `https://charts.gitlab.io`. | | `REPLICAS` | The number of replicas to deploy; defaults to 1. | diff --git a/doc/user/group/clusters/index.md b/doc/user/group/clusters/index.md index 52db51fd7bc..9fc50741407 100644 --- a/doc/user/group/clusters/index.md +++ b/doc/user/group/clusters/index.md @@ -61,8 +61,7 @@ differentiate the new cluster from the rest. ## Base domain -NOTE: **Note:** -[Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24580) in GitLab 11.8. +> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24580) in GitLab 11.8. Domains at the cluster level permit support for multiple domains per [multiple Kubernetes clusters](#multiple-kubernetes-clusters-premium). When specifying a domain, diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md index ff490478232..85a4af24dc5 100644 --- a/doc/user/project/clusters/index.md +++ b/doc/user/project/clusters/index.md @@ -174,8 +174,7 @@ applications running on the cluster. ## Base domain -NOTE: **Note:** -[Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24580) in GitLab 11.8. +> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24580) in GitLab 11.8. Domains at the cluster level permit support for multiple domains per [multiple Kubernetes clusters](#multiple-kubernetes-clusters-premium). When specifying a domain, |