diff options
author | Joshua Lambert <joshua@gitlab.com> | 2017-09-08 17:14:25 -0400 |
---|---|---|
committer | Joshua Lambert <joshua@gitlab.com> | 2017-09-08 17:14:25 -0400 |
commit | 4428a5fe08a48f3b985c8bd41b4223b0847eb855 (patch) | |
tree | d0b99d226aa630d385f952a09f5dbbfe79efca0b /doc/install | |
parent | 28a92bf0e9d57da2bfd775b3f16751f3cb9482e4 (diff) | |
download | gitlab-ce-4428a5fe08a48f3b985c8bd41b4223b0847eb855.tar.gz |
Diffstat (limited to 'doc/install')
-rw-r--r-- | doc/install/kubernetes/gitlab_omnibus.md | 2 | ||||
-rw-r--r-- | doc/install/kubernetes/gitlab_runner_chart.md | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/install/kubernetes/gitlab_omnibus.md b/doc/install/kubernetes/gitlab_omnibus.md index 109c847b175..9d1280c3dc6 100644 --- a/doc/install/kubernetes/gitlab_omnibus.md +++ b/doc/install/kubernetes/gitlab_omnibus.md @@ -23,7 +23,7 @@ The deployment includes: ### Limitations -* This chart is suited for small to medium size deployments, because [High Availability](../../administration/high_availability/) and [Geo](../../gitlab-geo/README.html) will not be supported. +* This chart is suited for small to medium size deployments, because [High Availability](https://docs.gitlab.com/ee/administration/high_availability/) and [Geo](https://docs.gitlab.com/ee/gitlab-geo/README.html) will not be supported. * It is in beta. Additional features to support production deployments, like backups, are [in development](https://gitlab.com/charts/charts.gitlab.io/issues/68). Once completed, this chart will be generally available. * A new generation of [cloud native charts](index.md#upcoming-cloud-native-helm-charts) is in development, and will eventually deprecate these. Due to the difficulty in supporting upgrades to the new architecture, migrating will require exporting data out of this instance and importing it into the new deployment. We do not expect these to be production ready before the second half of 2018. diff --git a/doc/install/kubernetes/gitlab_runner_chart.md b/doc/install/kubernetes/gitlab_runner_chart.md index df48cf4ceeb..5e0d7493b61 100644 --- a/doc/install/kubernetes/gitlab_runner_chart.md +++ b/doc/install/kubernetes/gitlab_runner_chart.md @@ -7,7 +7,7 @@ Kubernetes cluster. This chart configures the Runner to: -- Run using the GitLab Runner [Kubernetes executor](../../../runner/install/kubernetes.html) +- Run using the GitLab Runner [Kubernetes executor](https://docs.gitlab.com/runner/install/kubernetes.html) - For each new job it receives from [GitLab CI](https://about.gitlab.com/features/gitlab-ci-cd/), it will provision a new pod within the specified namespace to run it. @@ -118,7 +118,7 @@ runners: ### Controlling maximum Runner concurrency -A single GitLab Runner deployed on Kubernetes is able to execute multiple jobs in parallel by automatically starting additional Runner pods. The [`concurrent` setting](../../../runner/configuration/advanced-configuration.html#the-global-section) controls the maximum number of pods allowed at a single time, and defaults to `10`. +A single GitLab Runner deployed on Kubernetes is able to execute multiple jobs in parallel by automatically starting additional Runner pods. The [`concurrent` setting](https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-global-section) controls the maximum number of pods allowed at a single time, and defaults to `10`. ```yaml ## Configure the maximum number of concurrent jobs @@ -130,7 +130,7 @@ concurrent: 10 ### Running Docker-in-Docker containers with GitLab Runners See [Running Privileged Containers for the Runners](#running-privileged-containers-for-the-runners) for how to enable it, -and the [GitLab CI Runner documentation](../../../runner/executors/kubernetes.html#using-docker-in-your-builds) on running dind. +and the [GitLab CI Runner documentation](https://docs.gitlab.com/runner/executors/kubernetes.html#using-docker-in-your-builds) on running dind. ### Running privileged containers for the Runners @@ -138,7 +138,7 @@ You can tell the GitLab Runner to run using privileged containers. You may need this enabled if you need to use the Docker executable within your GitLab CI jobs. This comes with several risks that you can read about in the -[GitLab CI Runner documentation](../../../runner/executors/kubernetes.html#using-docker-in-your-builds). +[GitLab CI Runner documentation](https://docs.gitlab.com/runner/executors/kubernetes.html#using-docker-in-your-builds). If you are okay with the risks, and your GitLab CI Runner instance is registered against a specific project in GitLab that you trust the CI jobs of, you can @@ -164,7 +164,7 @@ Each key name in the Secret will be used as a filename in the directory, with th file content being the value associated with the key. More information on how GitLab Runner uses these certificates can be found in the -[Runner Documentation](../../../runner/configuration/tls-self-signed.html#supported-options-for-self-signed-certificates). +[Runner Documentation](https://docs.gitlab.com/runner/configuration/tls-self-signed.html#supported-options-for-self-signed-certificates). - The key/file name used should be in the format `<gitlab-hostname>.crt`. For example: `gitlab.your-domain.com.crt`. - Any intermediate certificates need to be concatenated to your server certificate in the same file. |