Commit dff774cf authored by Amy Qualls's avatar Amy Qualls

Merge branch 'ogolowinski-master-patch-97899' into 'master'

Improve AWS ECS in Auto DevOps documentation

See merge request gitlab-org/gitlab!33822
parents aa1a003f d3a5cc28
...@@ -104,7 +104,7 @@ knowledge of the following: ...@@ -104,7 +104,7 @@ knowledge of the following:
- [GitLab Runner](https://docs.gitlab.com/runner/) - [GitLab Runner](https://docs.gitlab.com/runner/)
- [Prometheus](https://prometheus.io/docs/introduction/overview/) - [Prometheus](https://prometheus.io/docs/introduction/overview/)
Auto DevOps provides great defaults for all the stages; you can, however, Auto DevOps provides great defaults for all the stages and makes use of [CI templates](https://gitlab.com/gitlab-org/gitlab/-/tree/master/lib/gitlab/ci/templates); you can, however,
[customize](customize.md) almost everything to your needs. [customize](customize.md) almost everything to your needs.
For an overview on the creation of Auto DevOps, read more For an overview on the creation of Auto DevOps, read more
...@@ -114,6 +114,10 @@ NOTE: **Note** ...@@ -114,6 +114,10 @@ NOTE: **Note**
Kubernetes clusters can [be used without](../../user/project/clusters/index.md) Kubernetes clusters can [be used without](../../user/project/clusters/index.md)
Auto DevOps. Auto DevOps.
## Kubernetes requirements
See [Auto DevOps requirements for Kubernetes](requirements.md#auto-devops-requirements-for-kubernetes).
## Auto DevOps base domain ## Auto DevOps base domain
The Auto DevOps base domain is required to use The Auto DevOps base domain is required to use
...@@ -163,6 +167,10 @@ set the Auto DevOps base domain to `1.2.3.4.nip.io`. ...@@ -163,6 +167,10 @@ set the Auto DevOps base domain to `1.2.3.4.nip.io`.
After completing setup, all requests hit the load balancer, which routes requests After completing setup, all requests hit the load balancer, which routes requests
to the Kubernetes pods running your application. to the Kubernetes pods running your application.
### AWS ECS
See [Auto DevOps requirements for Amazon ECS](requirements.md#auto-devops-requirements-for-amazon-ecs).
## Enabling/Disabling Auto DevOps ## Enabling/Disabling Auto DevOps
When first using Auto DevOps, review the [requirements](#requirements) to ensure When first using Auto DevOps, review the [requirements](#requirements) to ensure
......
...@@ -103,9 +103,9 @@ After all requirements are met, you can [enable Auto DevOps](index.md#enablingdi ...@@ -103,9 +103,9 @@ After all requirements are met, you can [enable Auto DevOps](index.md#enablingdi
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/208132) in GitLab 13.0. > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/208132) in GitLab 13.0.
You can choose to target [Amazon Elastic Container Service (ECS)](../../ci/cloud_deployment/index.md) as a deployment platform instead of using Kubernetes. You can choose to target [AWS ECS](../../ci/cloud_deployment/index.md) as a deployment platform instead of using Kubernetes.
To get started on Auto DevOps to Amazon ECS, you'll have to add a specific Environment To get started on Auto DevOps to AWS ECS, you'll have to add a specific Environment
Variable. To do so, follow these steps: Variable. To do so, follow these steps:
1. In your project, go to **Settings > CI / CD** and expand the **Variables** 1. In your project, go to **Settings > CI / CD** and expand the **Variables**
...@@ -116,9 +116,13 @@ Variable. To do so, follow these steps: ...@@ -116,9 +116,13 @@ Variable. To do so, follow these steps:
- `FARGATE` if the service you're targeting must be of launch type FARGATE. - `FARGATE` if the service you're targeting must be of launch type FARGATE.
- `ECS` if you're not enforcing any launch type check when deploying to ECS. - `ECS` if you're not enforcing any launch type check when deploying to ECS.
When you trigger a pipeline, if Auto DevOps is enabled and if you've correctly When you trigger a pipeline, if you have Auto DevOps enabled and if you have correctly
[entered AWS credentials as environment variables](../../ci/cloud_deployment/index.md#deploy-your-application-to-the-aws-elastic-container-service-ecs), [entered AWS credentials as environment variables](../../ci/cloud_deployment/index.md#deploy-your-application-to-the-aws-elastic-container-service-ecs),
your application will be deployed to Amazon ECS. your application will be deployed to AWS ECS.
NOTE: **Note:**
[GitLab Managed Apps](../../user/clusters/applications.md) are not available when deploying to AWS ECS.
You must manually configure your application (such as Ingress or Help) on AWS ECS.
NOTE: **Note:** NOTE: **Note:**
If you have both a valid `AUTO_DEVOPS_PLATFORM_TARGET` variable and a Kubernetes cluster tied to your project, If you have both a valid `AUTO_DEVOPS_PLATFORM_TARGET` variable and a Kubernetes cluster tied to your project,
...@@ -130,5 +134,5 @@ defined in the [`Jobs/Deploy/ECS.gitlab-ci.yml` template](https://gitlab.com/git ...@@ -130,5 +134,5 @@ defined in the [`Jobs/Deploy/ECS.gitlab-ci.yml` template](https://gitlab.com/git
However, it's not recommended to [include](../../ci/yaml/README.md#includetemplate) However, it's not recommended to [include](../../ci/yaml/README.md#includetemplate)
it on its own. This template is designed to be used with Auto DevOps only. It may change it on its own. This template is designed to be used with Auto DevOps only. It may change
unexpectedly causing your pipeline to fail if included on its own. Also, the job unexpectedly causing your pipeline to fail if included on its own. Also, the job
names within this template may also change. Don't override these jobs' names in your names within this template may also change. Do not override these jobs' names in your
own pipeline, as the override will stop working when the name changes. own pipeline, as the override will stop working when the name changes.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment