diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-05 00:08:43 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-05 00:08:43 +0300 |
commit | f9269785d97e5bdcae6bfce3f09029b5ccdf104d (patch) | |
tree | ffd248e02247b7a7db7b584c459355d88afc5e4d /doc/topics | |
parent | f2f95cc1bac06c8b4e506f02c1b90754adda67ec (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/topics')
-rw-r--r-- | doc/topics/autodevops/prepare_deployment.md | 6 | ||||
-rw-r--r-- | doc/topics/autodevops/requirements.md | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/topics/autodevops/prepare_deployment.md b/doc/topics/autodevops/prepare_deployment.md index b71beee708e..e69c0ca0909 100644 --- a/doc/topics/autodevops/prepare_deployment.md +++ b/doc/topics/autodevops/prepare_deployment.md @@ -54,17 +54,17 @@ Auto DevOps requires a wildcard DNS `A` record matching the base domains. For a base domain of `example.com`, you'd need a DNS entry like: ```plaintext -*.example.com 3600 A 1.2.3.4 +*.example.com 3600 A 10.0.2.2 ``` -In this case, the deployed applications are served from `example.com`, and `1.2.3.4` +In this case, the deployed applications are served from `example.com`, and `10.0.2.2` is the IP address of your load balancer, generally NGINX ([see requirements](requirements.md)). Setting up the DNS record is beyond the scope of this document; check with your DNS provider for information. Alternatively, you can use free public services like [nip.io](https://nip.io) which provide automatic wildcard DNS without any configuration. For [nip.io](https://nip.io), -set the Auto DevOps base domain to `1.2.3.4.nip.io`. +set the Auto DevOps base domain to `10.0.2.2.nip.io`. After completing setup, all requests hit the load balancer, which routes requests to the Kubernetes pods running your application. diff --git a/doc/topics/autodevops/requirements.md b/doc/topics/autodevops/requirements.md index dd73a2056e5..bfb88cf0dc4 100644 --- a/doc/topics/autodevops/requirements.md +++ b/doc/topics/autodevops/requirements.md @@ -71,17 +71,17 @@ Auto DevOps requires a wildcard DNS `A` record that matches the base domains. Fo a base domain of `example.com`, you'd need a DNS entry like: ```plaintext -*.example.com 3600 A 1.2.3.4 +*.example.com 3600 A 10.0.2.2 ``` -In this case, the deployed applications are served from `example.com`, and `1.2.3.4` +In this case, the deployed applications are served from `example.com`, and `10.0.2.2` is the IP address of your load balancer, generally NGINX ([see requirements](requirements.md)). Setting up the DNS record is beyond the scope of this document; check with your DNS provider for information. Alternatively, you can use free public services like [nip.io](https://nip.io) which provide automatic wildcard DNS without any configuration. For [nip.io](https://nip.io), -set the Auto DevOps base domain to `1.2.3.4.nip.io`. +set the Auto DevOps base domain to `10.0.2.2.nip.io`. After completing setup, all requests hit the load balancer, which routes requests to the Kubernetes pods running your application. |