Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
6b2c5f542b
commit
6e83834b19
|
@ -19,6 +19,8 @@ By combining GitLab, Kubernetes, and GitOps, you can have:
|
||||||
- GitLab as the GitOps operator.
|
- GitLab as the GitOps operator.
|
||||||
- Kubernetes as the automation and convergence system.
|
- Kubernetes as the automation and convergence system.
|
||||||
- GitLab CI/CD for Continuous Integration and the agent for Continuous Deployment.
|
- GitLab CI/CD for Continuous Integration and the agent for Continuous Deployment.
|
||||||
|
- Built-in automatic drift remediation.
|
||||||
|
- Resource management with [server-side applies](https://kubernetes.io/docs/reference/using-api/server-side-apply/) for transparent multi-actor field management.
|
||||||
|
|
||||||
This diagram shows the repositories and main actors in a GitOps deployment:
|
This diagram shows the repositories and main actors in a GitOps deployment:
|
||||||
|
|
||||||
|
@ -107,6 +109,21 @@ a Kubernetes SIG project. You can read more about the available annotations in t
|
||||||
- [Learn more about apply sort ordering](https://github.com/kubernetes-sigs/cli-utils#apply-sort-ordering).
|
- [Learn more about apply sort ordering](https://github.com/kubernetes-sigs/cli-utils#apply-sort-ordering).
|
||||||
- [Learn more about apply-time mutation](https://github.com/kubernetes-sigs/cli-utils#apply-time-mutation).
|
- [Learn more about apply-time mutation](https://github.com/kubernetes-sigs/cli-utils#apply-time-mutation).
|
||||||
|
|
||||||
|
## Automatic drift remediation
|
||||||
|
|
||||||
|
Drift happens when the current configuration of an infrastructure resource differs from its expected configuration.
|
||||||
|
Typically, this is caused by manually editing resources directly through the service that created the resource. Minimizing the
|
||||||
|
risk of drift helps to ensure configuration consistency and successful operations.
|
||||||
|
|
||||||
|
In GitLab, the agent for Kubernetes regularly compares the expected state from the `git` repository with
|
||||||
|
the known state from the `cluster`. Deviations from the `git` state are fixed at every check. These checks
|
||||||
|
happen automatically every 5 minutes. They are not configurable.
|
||||||
|
|
||||||
|
The agent uses [server-side applies](https://kubernetes.io/docs/reference/using-api/server-side-apply/).
|
||||||
|
As a result, every field in a resource can have different managers. Only fields managed by `git`
|
||||||
|
are checked for drift. This facilitates the use of in-cluster controllers to modify resources like
|
||||||
|
[Horizontal Pod Autoscalers](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/).
|
||||||
|
|
||||||
## Additional resources
|
## Additional resources
|
||||||
|
|
||||||
The following documentation and examples can help you get started with a GitOps workflow.
|
The following documentation and examples can help you get started with a GitOps workflow.
|
||||||
|
|
|
@ -26,8 +26,8 @@ The examples link to a search on GitLab.com to help you visualize the output.
|
||||||
|---|---|
|
|---|---|
|
||||||
[`“display bug”`](https://gitlab.com/search?snippets=&scope=issues&repository_ref=&search=%22display+bug%22&group_id=9970&project_id=278964) | Returns the **exact phrase** _display bug_ (stemming still applies). |
|
[`“display bug”`](https://gitlab.com/search?snippets=&scope=issues&repository_ref=&search=%22display+bug%22&group_id=9970&project_id=278964) | Returns the **exact phrase** _display bug_ (stemming still applies). |
|
||||||
[`bug -display`](https://gitlab.com/search?snippets=&scope=issues&repository_ref=&search=bug+-display&group_id=9970&project_id=278964) | Results include _bug_, and **exclude** _display_. |
|
[`bug -display`](https://gitlab.com/search?snippets=&scope=issues&repository_ref=&search=bug+-display&group_id=9970&project_id=278964) | Results include _bug_, and **exclude** _display_. |
|
||||||
[`bug \| display`](https://gitlab.com/search?snippets=&scope=issues&repository_ref=&search=bug+display+%7C+banner&group_id=9970&project_id=278964) | Results include _bug_ **or** _display_. |
|
[<code>bug | display</code>](https://gitlab.com/search?snippets=&scope=issues&repository_ref=&search=bug+%7C+banner&group_id=9970&project_id=278964) | Results include _bug_ **or** _display_. |
|
||||||
[`bug \| (display +banner)`](https://gitlab.com/search?snippets=&scope=issues&repository_ref=&search=bug+%7C+%28display+%2Bbanner%29&group_id=9970&project_id=278964) | Results include _bug_ **or** _display_ **and** _banner_. |
|
[<code>bug | (display +banner)</code>](https://gitlab.com/search?snippets=&scope=issues&repository_ref=&search=bug+%7C+%28display+%2Bbanner%29&group_id=9970&project_id=278964) | Results include _bug_ **or** _display_ **and** _banner_. |
|
||||||
| [`bug error 50*`](https://gitlab.com/search?snippets=&scope=issues&repository_ref=&search=bug+error+50*&group_id=9970&project_id=278964) | `*` finds **partial matches**. Results include _bug_, _error_, and the partial _50_ (looking for any 500 errors, for example). |
|
| [`bug error 50*`](https://gitlab.com/search?snippets=&scope=issues&repository_ref=&search=bug+error+50*&group_id=9970&project_id=278964) | `*` finds **partial matches**. Results include _bug_, _error_, and the partial _50_ (looking for any 500 errors, for example). |
|
||||||
| [`bug \-display`](https://gitlab.com/search?snippets=&scope=blobs&repository_ref=&search=argument+%5C-last&group_id=9970&project_id=278964) | `\` **scapes symbols**. Results include _bug_ **and** _-display_. |
|
| [`bug \-display`](https://gitlab.com/search?snippets=&scope=blobs&repository_ref=&search=argument+%5C-last&group_id=9970&project_id=278964) | `\` **scapes symbols**. Results include _bug_ **and** _-display_. |
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue