Skip to content

Commit 0e42388

Browse files
committed
Merge branch 'eread/fix-misc-markdown-formatting-issues-docs' into 'main'
Fix miscellaneous Markdown formatting issues See merge request https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/6347 Merged-by: Evan Read <eread@gitlab.com> Approved-by: Sam Roque-Worcel <sroque-worcel@gitlab.com> Approved-by: Uma Chandran <uchandran@gitlab.com> Reviewed-by: Uma Chandran <uchandran@gitlab.com>
2 parents 633b362 + f9b5c8a commit 0e42388

8 files changed

Lines changed: 28 additions & 30 deletions

File tree

docs/configuration/advanced-configuration.md

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -82,22 +82,20 @@ For more information, see:
8282
- [Long polling for runners](https://docs.gitlab.com/ci/runners/long_polling/)
8383
- [Workhorse configuration](https://docs.gitlab.com/development/workhorse/configuration/)
8484

85-
**Symptoms:**
85+
Symptoms:
8686

8787
- Jobs from some projects experience delays before starting (duration matches your GitLab instance long polling timeout)
8888
- Jobs from other projects run immediately
8989
- Warning message in runner logs: `CONFIGURATION: Long polling issues detected`
9090

91-
**Common problematic scenarios:**
91+
Common problematic scenarios:
9292

9393
- Worker starvation bottleneck: The `concurrent` setting is less than the number of runners (severe bottleneck)
9494
- Request bottleneck: Runners with `request_concurrency=1` cause job delays during long polling
9595
- Build limit bottleneck: Runners with low `limit` settings (≤2) combined with `request_concurrency=1`
9696

97-
**Solution options:**
98-
99-
GitLab Runner automatically detects the problem scenarios and provides tailored solutions in the warning messages.
100-
Common solutions include:
97+
GitLab Runner automatically detects the problem scenarios and provides tailored solutions in the
98+
warning messages. Common solutions include:
10199

102100
- Increase the `concurrent` setting to exceed the number of runners.
103101
- Set the `request_concurrency` value for high-volume runners to a value higher than 1 (default is 1).
@@ -107,9 +105,9 @@ Common solutions include:
107105
see the [feature flags documentation](feature-flags.md).
108106
- Balance `limit` settings with expected job volume.
109107

110-
**Example problematic configurations:**
108+
##### Example problematic configurations
111109

112-
**Scenario 1: Worker starvation bottleneck**
110+
Scenario 1: Worker starvation bottleneck:
113111

114112
```toml
115113
concurrent = 2 # Only 2 concurrent workers
@@ -122,7 +120,7 @@ concurrent = 2 # Only 2 concurrent workers
122120
name = "runner-3" # 3 runners, only 2 workers - severe bottleneck
123121
```
124122

125-
**Scenario 2: Request bottleneck**
123+
Scenario 2: Request bottleneck:
126124

127125
```toml
128126
concurrent = 4 # 4 workers available
@@ -133,7 +131,7 @@ concurrent = 4 # 4 workers available
133131
limit = 10 # Can handle 10 jobs, but only 1 request slot
134132
```
135133

136-
**Scenario 3: Build limit bottleneck**
134+
Scenario 3: Build limit bottleneck:
137135

138136
```toml
139137
concurrent = 4
@@ -145,7 +143,7 @@ concurrent = 4
145143
# Creates severe bottleneck: builds at capacity + request slot blocked by long polling
146144
```
147145

148-
**Example corrected configuration:**
146+
##### Example corrected configuration
149147

150148
```toml
151149
concurrent = 4 # Adequate worker capacity
@@ -760,11 +758,11 @@ precedence is taken into account:
760758
1. Credentials configured with `DOCKER_AUTH_CONFIG`.
761759
1. Credentials configured locally on the GitLab Runner host with `~/.docker/config.json`
762760
or `~/.dockercfg` files (for example, by running `docker login` on the host).
763-
1. Credentials sent by default with a job's payload (for example, credentials for the *integrated
764-
registry* described earlier).
761+
1. Credentials sent by default with a job's payload (for example, credentials for the integrated
762+
registry described earlier).
765763

766764
The first credentials found for the registry are used. So for example,
767-
if you add credentials for the *integrated registry* with the
765+
if you add credentials for the integrated registry with the
768766
`DOCKER_AUTH_CONFIG` variable, then the default credentials are overridden.
769767

770768
## The `[runners.parallels]` section

docs/configuration/autoscale.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ for the rest of the week, and on the weekends, no pipelines are started.
424424
These periods can be configured with the help of `[[runners.machine.autoscaling]]` sections.
425425
Each of them supports setting `IdleCount` and `IdleTime` based on a set of `Periods`.
426426

427-
**How autoscaling periods work**
427+
### How autoscaling periods work
428428

429429
In the `[runners.machine]` settings, you can add multiple `[[runners.machine.autoscaling]]` sections, each one with its own `IdleCount`, `IdleTime`, `Periods` and `Timezone` properties. A section should be defined for each configuration, proceeding in order from the most general scenario to the most specific scenario.
430430

@@ -456,7 +456,7 @@ The rest of the time, the values are taken from the defaults in the root - `Idle
456456
{{< alert type="note" >}}
457457

458458
The 59th second of the last
459-
minute in any period that you specify is *not* be considered part of the
459+
minute in any period that you specify is not be considered part of the
460460
period. For more information, see [issue #2170](https://gitlab.com/gitlab-org/gitlab-runner/-/issues/2170).
461461

462462
{{< /alert >}}

docs/configuration/configuring_runner_operator.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -407,17 +407,15 @@ fatal: detected dubious ownership in repository at '/builds/gitlab-org/gitlab-ru
407407

408408
This error indicates that the repository was cloned by user ID `1001` (helper container), but a different user ID in the build container is attempting to access it.
409409

410-
**Solution**
411-
412-
Configure your build container's security context to match the helper container's user ID and group ID:
410+
Solution: configure your build container's security context to match the helper container's user ID and group ID:
413411

414412
```toml
415413
[runners.kubernetes.build_container_security_context]
416414
run_as_user = 1001
417415
run_as_group = 1001
418416
```
419417

420-
**Additional notes**
418+
Additional notes:
421419

422420
- These settings ensure consistent file ownership between the container that clones the repository and the container that builds it.
423421
- If you've customized your helper image with different user ID or group IDs, adjust these values accordingly.

docs/configuration/macos_setup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ When you create and register the runner:
116116
After you register the runner, a success message displays in the command-line:
117117

118118
```shell
119-
> Runner registered successfully. Feel free to start it, but if it's running already the config should be automatically reloaded!
119+
Runner registered successfully. Feel free to start it, but if it's running already the config should be automatically reloaded!
120120
```
121121
122122
To view the runner:

docs/configuration/runner_autoscale_aws_fargate/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,9 +256,9 @@ Now install GitLab Runner on the Ubuntu instance.
256256
- If `EnablePublicIP` is set to true, the public IP of the task container is gathered to perform the SSH connection.
257257
- If `EnablePublicIP` is set to false:
258258
- The Fargate driver uses the task container's private IP. To set up a connection when set to `false`, the VPC Security Group must
259-
have an inbound rule for Port 22 (SSH), where the source is the VPC CIDR.
259+
have an inbound rule for Port 22 (SSH), where the source is the VPC CIDR.
260260
- To fetch external dependencies, provisioned AWS Fargate containers must have access to the public internet. To provide
261-
public internet access for AWS Fargate containers, you can use a NAT Gateway in the VPC.
261+
public internet access for AWS Fargate containers, you can use a NAT Gateway in the VPC.
262262

263263
- The port number of the SSH server is optional. If omitted, the default SSH port (22) is used.
264264
- For more information about the section settings, see the [Fargate driver documentation](https://gitlab.com/gitlab-org/ci-cd/custom-executor-drivers/fargate/-/tree/master/docs#configuration).

docs/executors/kubernetes/_index.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ You can either:
127127
You can use the following YAML role definition to create a role with the required permissions.
128128

129129
<!-- k8s_api_permissions_role_yaml_start -->
130+
130131
```yaml
131132
apiVersion: rbac.authorization.k8s.io/v1
132133
kind: Role
@@ -188,6 +189,7 @@ rules:
188189
- "create"
189190
- "get"
190191
```
192+
191193
<!-- k8s_api_permissions_role_yaml_end -->
192194
193195
Additional details:
@@ -2392,7 +2394,7 @@ In GitLab 15.1 and later, the entrypoint defined in a Docker image is used with
23922394

23932395
The container entry point has the following known issues:
23942396

2395-
- <a id="open-valid-shell"></a> If an entrypoint is defined in the Dockerfile for an image, it must open a valid shell. Otherwise, the job hangs.
2397+
- If an entrypoint is defined in the Dockerfile for an image, it must open a valid shell. Otherwise, the job hangs.
23962398

23972399
- To open a shell, the system passes the command as
23982400
[`args`](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#entrypoint)
@@ -2409,7 +2411,7 @@ The container entry point has the following known issues:
24092411
Before GitLab Runner 17.4:
24102412

24112413
- The entrypoint logs were not forwarded to the build's log.
2412-
- With the Kubernetes executor with `kube exec`, GitLab Runner did not wait for the entrypoint to open a shell (see [above](#open-valid-shell)).
2414+
- With the Kubernetes executor with `kube exec`, GitLab Runner did not wait for the entrypoint to open a shell (see earlier in this section).
24132415

24142416
Starting with GitLab Runner 17.4, the entrypoint logs are now forwarded. The system waits
24152417
for the entrypoint to run and spawn the shell. This has the following
@@ -2419,7 +2421,7 @@ implications:
24192421
longer than `poll_timeout` (default: 180 s), the build fails. The
24202422
`poll_timeout` value (and potentially `poll_interval`)
24212423
must be adapted if the entrypoint is expected to run longer.
2422-
- When `FF_KUBERNETES_HONOR_ENTRYPOINT` *and* `FF_USE_LEGACY_KUBERNETES_EXECUTION_STRATEGY` are set, the system adds a
2424+
- When `FF_KUBERNETES_HONOR_ENTRYPOINT` and `FF_USE_LEGACY_KUBERNETES_EXECUTION_STRATEGY` are set, the system adds a
24232425
[startup probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#define-startup-probes)
24242426
to the build container, so that it knows when the entrypoint is spawning
24252427
the shell. If a custom entrypoint uses the provided `args`

docs/shells/_index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ fi
8080
Executors that load shell profiles:
8181

8282
- [`shell`](../executors/shell.md)
83-
- [`parallels`](../executors/parallels.md) (The shell profile of the *target* virtual machine is loaded)
84-
- [`virtualbox`](../executors/virtualbox.md) (The shell profile of the *target* virtual machine is loaded)
85-
- [`ssh`](../executors/ssh.md) (The shell profile of the *target* machine is loaded)
83+
- [`parallels`](../executors/parallels.md) (The shell profile of the target virtual machine is loaded)
84+
- [`virtualbox`](../executors/virtualbox.md) (The shell profile of the target virtual machine is loaded)
85+
- [`ssh`](../executors/ssh.md) (The shell profile of the target machine is loaded)
8686

8787
## PowerShell
8888

magefiles/kubernetes/docs/generate_permissions.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func GeneratePermissionsDocs(roleName, roleNamespace string, permissions Permiss
6464
return err
6565
}
6666

67-
roleYamlContent := fmt.Sprintf("```yaml\n%s\n```\n", strings.TrimSpace(roleYaml))
67+
roleYamlContent := fmt.Sprintf("\n```yaml\n%s\n```\n\n", strings.TrimSpace(roleYaml))
6868

6969
newDocsFile, err = replace(roleYamlPlaceholderName, newDocsFile, roleYamlContent)
7070
if err != nil {

0 commit comments

Comments
 (0)