Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
d919218e
Commit
d919218e
authored
Jun 21, 2021
by
Marcia Ramos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update master => default
parent
c9cbc2a1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
doc/user/clusters/applications.md
doc/user/clusters/applications.md
+1
-1
doc/user/infrastructure/index.md
doc/user/infrastructure/index.md
+1
-1
No files found.
doc/user/clusters/applications.md
View file @
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
)
.
...
...
doc/user/infrastructure/index.md
View file @
d919218e
...
@@ -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:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment