Commit c770958c authored by Nick Gaskill's avatar Nick Gaskill

Merge branch 'docs-replace-master-default-configure-2' into 'master'

Docs: Configure - update master => default

See merge request gitlab-org/gitlab!64494
parents c3cb22a8 d919218e
...@@ -90,7 +90,7 @@ To install applications using GitLab CI/CD: ...@@ -90,7 +90,7 @@ To install applications using GitLab CI/CD:
1. Optionally, define `.gitlab/managed-apps/<application>/values.yaml` file to 1. Optionally, define `.gitlab/managed-apps/<application>/values.yaml` file to
customize values for the installed application. customize values for the installed application.
A GitLab CI/CD pipeline runs on the `master` branch to install the A GitLab CI/CD pipeline runs on the default branch to install the
applications you have configured. In case of pipeline failure, the applications you have configured. In case of pipeline failure, the
output of the [Helm Tiller](https://v2.helm.sh/docs/install/#running-tiller-locally) binary output of the [Helm Tiller](https://v2.helm.sh/docs/install/#running-tiller-locally) binary
is saved as a [CI job artifact](../../ci/pipelines/job_artifacts.md). is saved as a [CI job artifact](../../ci/pipelines/job_artifacts.md).
......
...@@ -38,7 +38,7 @@ This template includes some opinionated decisions, which you can override: ...@@ -38,7 +38,7 @@ This template includes some opinionated decisions, which you can override:
- Creating [four pipeline stages](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Terraform.gitlab-ci.yml): - Creating [four pipeline stages](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Terraform.gitlab-ci.yml):
`init`, `validate`, `build`, and `deploy`. These stages `init`, `validate`, `build`, and `deploy`. These stages
[run the Terraform commands](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Terraform/Base.gitlab-ci.yml) [run the Terraform commands](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Terraform/Base.gitlab-ci.yml)
`init`, `validate`, `plan`, `plan-json`, and `apply`. The `apply` command only runs on `master`. `init`, `validate`, `plan`, `plan-json`, and `apply`. The `apply` command only runs on the default branch.
This video from January 2021 walks you through all the GitLab Terraform integration features: This video from January 2021 walks you through all the GitLab Terraform integration features:
......
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