Fixes Cluster domain documentation
Uses the preferred way for introduced blocks instead of notes, on auto devops and cluster documentation. Also fixes some typos.
This commit is contained in:
parent
f4f3f286f1
commit
1a336b20ed
|
@ -140,8 +140,8 @@ in any of the following places:
|
||||||
- or at the group level as a variable: `KUBE_INGRESS_BASE_DOMAIN`.
|
- or at the group level as a variable: `KUBE_INGRESS_BASE_DOMAIN`.
|
||||||
|
|
||||||
NOTE: **Note**
|
NOTE: **Note**
|
||||||
Auto DevOps base domain variable (`KUBE_INGRESS_BASE_DOMAIN`) follows the same order of precedence
|
The 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).
|
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,
|
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:
|
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** |
|
| **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` | 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`. |
|
| `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. |
|
| `REPLICAS` | The number of replicas to deploy; defaults to 1. |
|
||||||
|
|
|
@ -61,8 +61,7 @@ differentiate the new cluster from the rest.
|
||||||
|
|
||||||
## Base domain
|
## 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
|
Domains at the cluster level permit support for multiple domains
|
||||||
per [multiple Kubernetes clusters](#multiple-kubernetes-clusters-premium). When specifying a domain,
|
per [multiple Kubernetes clusters](#multiple-kubernetes-clusters-premium). When specifying a domain,
|
||||||
|
|
|
@ -174,8 +174,7 @@ applications running on the cluster.
|
||||||
|
|
||||||
## Base domain
|
## 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
|
Domains at the cluster level permit support for multiple domains
|
||||||
per [multiple Kubernetes clusters](#multiple-kubernetes-clusters-premium). When specifying a domain,
|
per [multiple Kubernetes clusters](#multiple-kubernetes-clusters-premium). When specifying a domain,
|
||||||
|
|
Loading…
Reference in New Issue