Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-17 00:08:24 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-17 00:08:24 +0300
commit727b1a890c8e44440414c59611e9ead34d6edc93 (patch)
treede5f272452d2ee4d3e2edb90936fe7ecca127431 /doc/user/clusters
parentaa0f0e992153e84e1cdec8a1c7310d5eb93a9f8f (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/clusters')
-rw-r--r--doc/user/clusters/applications.md34
1 files changed, 33 insertions, 1 deletions
diff --git a/doc/user/clusters/applications.md b/doc/user/clusters/applications.md
index 507c027d43f..47d835a1622 100644
--- a/doc/user/clusters/applications.md
+++ b/doc/user/clusters/applications.md
@@ -476,6 +476,7 @@ Supported applications:
- [Ingress](#install-ingress-using-gitlab-ci)
- [cert-manager](#install-cert-manager-using-gitlab-ci)
- [Sentry](#install-sentry-using-gitlab-ci)
+- [GitLab Runner](#install-gitlab-runner-using-gitlab-ci)
### Usage
@@ -562,7 +563,7 @@ certManager:
installed: false
```
-You can customize the installation of Ingress by defining
+You can customize the installation of cert-manager by defining
`.gitlab/managed-apps/cert-manager/values.yaml` file in your cluster
management project. Refer to the
[chart](https://hub.helm.sh/charts/jetstack/cert-manager) for the
@@ -629,6 +630,37 @@ postgresql:
postgresqlPassword: example-postgresql-password
```
+### Install GitLab Runner using GitLab CI
+
+GitLab Runner is installed using GitLab CI by defining configuration in
+`.gitlab/managed-apps/config.yaml`.
+
+The following configuration is required to install GitLab Runner using GitLab CI:
+
+```yaml
+gitlabRunner:
+ installed: true
+```
+
+GitLab Runner is installed into the `gitlab-managed-apps` namespace of your cluster.
+
+In order for GitLab Runner to function, you **must** specify the following:
+
+- `gitlabUrl` - the GitLab server full URL (e.g., `https://example.gitlab.com`) to register the Runner against.
+- `runnerRegistrationToken` - The registration token for adding new Runners to GitLab. This must be
+ [retrieved from your GitLab instance](../../ci/runners/README.md).
+
+These values can be specifed using [CI variables](../../ci/variables/README.md):
+
+- `GITLAB_RUNNER_GITLAB_URL` will be used for `gitlabUrl`.
+- `GITLAB_RUNNER_REGISTRATION_TOKEN` will be used for `runnerRegistrationToken`
+
+You can customize the installation of GitLab Runner by defining
+`.gitlab/managed-apps/gitlab-runner/values.yaml` file in your cluster
+management project. Refer to the
+[chart](https://gitlab.com/gitlab-org/charts/gitlab-runner) for the
+available configuration options.
+
## Upgrading applications
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/24789) in GitLab 11.8.