Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
GitLab Bot
parent
3cd08f4bf9
commit
dcce066c50
|
|
@ -3,10 +3,9 @@
|
|||
#
|
||||
# For a list of all options, see https://errata-ai.github.io/vale/styles/
|
||||
extends: substitution
|
||||
message: Use `%s` instead of `%s`.
|
||||
message: Use "%s" instead of "%s".
|
||||
link: https://about.gitlab.com/handbook/communication/#top-misused-terms
|
||||
level: warning
|
||||
nonword: true
|
||||
level: error
|
||||
ignorecase: true
|
||||
swap:
|
||||
GitLabber: GitLab team member
|
||||
|
|
|
|||
|
|
@ -98,9 +98,9 @@ If a new subscription would cause the total number of subscription to exceed the
|
|||
limit, the subscription will be considered invalid.
|
||||
|
||||
- On GitLab.com different [limits are defined per plan](../user/gitlab_com/index.md#gitlab-cicd) and they affect all projects under that plan.
|
||||
- On [GitLab Starter](https://about.gitlab.com/pricing/#self-managed) tier or higher self-hosted installations, this limit is defined for the `default` plan that affects all projects.
|
||||
- On [GitLab Starter](https://about.gitlab.com/pricing/#self-managed) tier or higher self-managed installations, this limit is defined for the `default` plan that affects all projects.
|
||||
|
||||
To set this limit on a self-hosted installation, run the following in the
|
||||
To set this limit on a self-managed installation, run the following in the
|
||||
[GitLab Rails console](https://docs.gitlab.com/omnibus/maintenance/#starting-a-rails-console-session):
|
||||
|
||||
```ruby
|
||||
|
|
|
|||
|
|
@ -937,6 +937,9 @@ This could result in some unexpected behavior, including:
|
|||
|
||||
`rules` allows for a list of individual rule objects to be evaluated
|
||||
*in order*, until one matches and dynamically provides attributes to the job.
|
||||
Note that `rules` cannot be used in combination with `only/except` since it is intended
|
||||
to replace that functionality. If you attempt to do this the linter will return a
|
||||
`key may not be used with rules` error.
|
||||
|
||||
Available rule clauses include:
|
||||
|
||||
|
|
|
|||
|
|
@ -112,17 +112,15 @@ end
|
|||
|
||||
### Subscription Plans
|
||||
|
||||
Self-hosted:
|
||||
Self-managed:
|
||||
|
||||
- `default` - Everyone
|
||||
|
||||
Hosted:
|
||||
GitLab.com:
|
||||
|
||||
- `free` - Everyone
|
||||
- `bronze`- Namespaces with a Bronze subscription
|
||||
- `silver` - Namespaces with a Silver subscription
|
||||
- `gold` - Namespaces with a Gold subscription
|
||||
|
||||
NOTE: **Note:** Hosted plans exist only on GitLab.com.
|
||||
|
||||
NOTE: **Note:** The test environment doesn't have any plans.
|
||||
|
|
|
|||
|
|
@ -9,42 +9,43 @@ pipeline](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/6665).
|
|||
|
||||
```mermaid
|
||||
graph TD
|
||||
build-qa-image -->|once the `prepare` stage is done| gitlab:assets:compile
|
||||
gitlab:assets:compile -->|once the `gitlab:assets:compile` job is done| review-build-cng
|
||||
review-build-cng -.->|triggers a CNG-mirror pipeline and wait for it to be done| CNG-mirror
|
||||
CNG-mirror -.->|polls until completed| review-build-cng
|
||||
review-build-cng -->|once the `review-build-cng` job is done| review-deploy
|
||||
review-deploy -->|once the `review-deploy` job is done| review-qa-smoke
|
||||
A["build-qa-image, gitlab:assets:compile pull-cache<br/>(canonical default refs only)"];
|
||||
B[review-build-cng];
|
||||
C[review-deploy];
|
||||
D[CNG-mirror];
|
||||
E[review-qa-smoke];
|
||||
|
||||
subgraph "1. gitlab-foss/gitlab `prepare` stage"
|
||||
build-qa-image
|
||||
end
|
||||
A -->|once the `prepare` stage is done| B
|
||||
B -.->|triggers a CNG-mirror pipeline and wait for it to be done| D
|
||||
D -.->|polls until completed| B
|
||||
B -->|once the `review-build-cng` job is done| C
|
||||
C -->|once the `review-deploy` job is done| E
|
||||
|
||||
subgraph "2. gitlab-foss/gitlab `test` stage"
|
||||
gitlab:assets:compile
|
||||
end
|
||||
subgraph "1. gitlab `prepare` stage"
|
||||
A
|
||||
end
|
||||
|
||||
subgraph "3. gitlab-foss/gitlab `review-prepare` stage"
|
||||
review-build-cng
|
||||
end
|
||||
subgraph "2. gitlab `review-prepare` stage"
|
||||
B
|
||||
end
|
||||
|
||||
subgraph "4. gitlab-foss/gitlab `review` stage"
|
||||
review-deploy["review-deploy<br><br>Helm deploys the Review App using the Cloud<br/>Native images built by the CNG-mirror pipeline.<br><br>Cloud Native images are deployed to the `review-apps-ce` or `review-apps-ee`<br>Kubernetes (GKE) cluster, in the GCP `gitlab-review-apps` project."]
|
||||
end
|
||||
subgraph "3. gitlab `review` stage"
|
||||
C["review-deploy<br><br>Helm deploys the Review App using the Cloud<br/>Native images built by the CNG-mirror pipeline.<br><br>Cloud Native images are deployed to the `review-apps-ce` or `review-apps-ee`<br>Kubernetes (GKE) cluster, in the GCP `gitlab-review-apps` project."]
|
||||
end
|
||||
|
||||
subgraph "5. gitlab-foss/gitlab `qa` stage"
|
||||
review-qa-smoke[review-qa-smoke<br><br>gitlab-qa runs the smoke suite against the Review App.]
|
||||
end
|
||||
subgraph "4. gitlab `qa` stage"
|
||||
E[review-qa-smoke<br><br>gitlab-qa runs the smoke suite against the Review App.]
|
||||
end
|
||||
|
||||
subgraph "CNG-mirror pipeline"
|
||||
CNG-mirror>Cloud Native images are built];
|
||||
end
|
||||
D>Cloud Native images are built];
|
||||
end
|
||||
```
|
||||
|
||||
### Detailed explanation
|
||||
|
||||
1. On every [pipeline][gitlab-pipeline] during the `test` stage, the
|
||||
[`gitlab:assets:compile`][gitlab:assets:compile] job is automatically started.
|
||||
[`gitlab:assets:compile`][gitlab:assets:compile pull-cache] job is automatically started.
|
||||
- Once it's done, it starts the [`review-build-cng`][review-build-cng]
|
||||
manual job since the [`CNG-mirror`][cng-mirror] pipeline triggered in the
|
||||
following step depends on it.
|
||||
|
|
@ -223,7 +224,7 @@ failing to cleanup stale Review Apps and Kubernetes resources.
|
|||
|
||||
**Where to look for further debugging:**
|
||||
|
||||
Look at the latest `schedule:review-cleanup` job log, and identify look for any
|
||||
Look at the latest `review-cleanup` job log, and identify look for any
|
||||
unexpected failure.
|
||||
|
||||
### p99 CPU utilization is at 100% for most of the nodes and/or many components
|
||||
|
|
@ -388,10 +389,10 @@ find a way to limit it to only us.**
|
|||
- [Stern](https://github.com/wercker/stern) - enables cross pod log tailing based on label/field selectors
|
||||
|
||||
[charts-1068]: https://gitlab.com/gitlab-org/charts/gitlab/issues/1068
|
||||
[gitlab-pipeline]: https://gitlab.com/gitlab-org/gitlab-foss/pipelines/44362587
|
||||
[gitlab:assets:compile]: https://gitlab.com/gitlab-org/gitlab-foss/-/jobs/149511610
|
||||
[review-build-cng]: https://gitlab.com/gitlab-org/gitlab-foss/-/jobs/149511623
|
||||
[review-deploy]: https://gitlab.com/gitlab-org/gitlab-foss/-/jobs/149511624
|
||||
[gitlab-pipeline]: https://gitlab.com/gitlab-org/gitlab/pipelines/125315730
|
||||
[gitlab:assets:compile pull-cache]: https://gitlab.com/gitlab-org/gitlab/-/jobs/467724487
|
||||
[review-build-cng]: https://gitlab.com/gitlab-org/gitlab/-/jobs/467724808
|
||||
[review-deploy]: https://gitlab.com/gitlab-org/gitlab/-/jobs/467724810
|
||||
[cng-mirror]: https://gitlab.com/gitlab-org/build/CNG-mirror
|
||||
[cng]: https://gitlab.com/gitlab-org/build/CNG
|
||||
[cng-mirror-pipeline]: https://gitlab.com/gitlab-org/build/CNG-mirror/pipelines/44364657
|
||||
|
|
|
|||
|
|
@ -489,6 +489,7 @@ Supported applications:
|
|||
- [Cilium](#install-cilium-using-gitlab-ci)
|
||||
- [JupyterHub](#install-jupyterhub-using-gitlab-ci)
|
||||
- [Elastic Stack](#install-elastic-stack-using-gitlab-ci)
|
||||
- [Crossplane](#install-crossplane-using-gitlab-ci)
|
||||
|
||||
### Usage
|
||||
|
||||
|
|
@ -827,6 +828,30 @@ available configuration options.
|
|||
NOTE: **Note:**
|
||||
In this alpha implementation of installing Elastic Stack through CI, reading the environment logs through Elasticsearch is unsupported. This is supported if [installed via the UI](#elastic-stack).
|
||||
|
||||
### Install Crossplane using GitLab CI
|
||||
|
||||
> [Introduced](https://gitlab.com/gitlab-org/cluster-integration/cluster-applications/-/merge_requests/68) in GitLab 12.9.
|
||||
|
||||
Crossplane is installed using GitLab CI by defining configuration in
|
||||
`.gitlab/managed-apps/config.yaml`.
|
||||
|
||||
The following configuration is required to install Crossplane using GitLab CI:
|
||||
|
||||
```yaml
|
||||
Crossplane:
|
||||
installed: true
|
||||
```
|
||||
|
||||
Crossplane is installed into the `gitlab-managed-apps` namespace of your cluster.
|
||||
|
||||
You can check the default [values.yaml](https://github.com/crossplane/crossplane/blob/master/cluster/charts/crossplane/values.yaml.tmpl) we set for this chart.
|
||||
|
||||
You can customize the installation of Crossplane by defining
|
||||
`.gitlab/managed-apps/crossplane/values.yaml` file in your cluster
|
||||
management project. Refer to the
|
||||
[chart](https://github.com/crossplane/crossplane/tree/master/cluster/charts/crossplane#configuration) for the
|
||||
available configuration options. Note that this link points to the docs for the current development release, which may differ from the version you have installed. You can check out a specific version in the branch/tag switcher.
|
||||
|
||||
## Upgrading applications
|
||||
|
||||
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/24789) in GitLab 11.8.
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ If you need to migrate all data over, you can leverage our [API](../../../api/RE
|
|||
The order of assets to migrate from a self-managed instance to GitLab.com is the following:
|
||||
|
||||
NOTE: **Note:**
|
||||
When migrating to GitLab.com, users would need to be manually created unless [SCIM](../../../user/group/saml_sso/scim_setup.md) is going to be used. Creating users with the API is limited to self-hosted instances as it requires administrator access.
|
||||
When migrating to GitLab.com, users would need to be manually created unless [SCIM](../../../user/group/saml_sso/scim_setup.md) is going to be used. Creating users with the API is limited to self-managed instances as it requires administrator access.
|
||||
|
||||
1. [Groups](../../../api/groups.md)
|
||||
1. [Projects](../../../api/projects.md)
|
||||
|
|
|
|||
Loading…
Reference in New Issue