From 61f4f03d4843ddfbc00776644181e647c945edc9 Mon Sep 17 00:00:00 2001 From: Matthias Kaeppler Date: Tue, 28 Jun 2022 14:23:37 +0200 Subject: [PATCH 1/4] Clarify global.gitlabVersion usage --- doc/charts/globals.md | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/doc/charts/globals.md b/doc/charts/globals.md index cd6e936ee4..a676042ccd 100644 --- a/doc/charts/globals.md +++ b/doc/charts/globals.md @@ -183,13 +183,29 @@ The GitLab version used in the default image tag for the charts can be changed u the `global.gitlabVersion` key: ```shell ---set global.gitlabVersion=11.0.1 +--set global.gitlabVersion=14.7.0 ``` This impacts the default image tag used in the `webservice`, `sidekiq`, and `migration` -charts. Note that the `gitaly`, `gitlab-shell` and `gitlab-runner` image tags should +charts. The version set here will be resolved to the following images: + +``` +registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ee:v14.7.0 +registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ee:v14.7.0 +registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ee:v14.7.0 +... +``` + +For a list of available tags you can browse the [GitLab Container Registry](https://gitlab.com/groups/gitlab-org/-/container_registries/). + +Note that the `gitaly`, `gitlab-shell` and `gitlab-runner` image tags should be separately updated to versions compatible with the GitLab version. +Similarly, if you wish to use images built from GitLab branches, which are published to different +image repositories, you will have to set `gitlab..image.repository` +and `gitlab..image.tag` accordingly. The repository and tag can be obtained +from the CI/CD logs of the merge request that triggered the build. + ## Configure PostgreSQL settings The GitLab global PostgreSQL settings are located under the `global.psql` key. -- GitLab From c8136518144d1ec373221a3ad46220802de99a3d Mon Sep 17 00:00:00 2001 From: Matthias Kaeppler Date: Tue, 28 Jun 2022 14:53:51 +0200 Subject: [PATCH 2/4] Add skopeo usage example --- doc/charts/globals.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/charts/globals.md b/doc/charts/globals.md index a676042ccd..a47c489911 100644 --- a/doc/charts/globals.md +++ b/doc/charts/globals.md @@ -189,7 +189,7 @@ the `global.gitlabVersion` key: This impacts the default image tag used in the `webservice`, `sidekiq`, and `migration` charts. The version set here will be resolved to the following images: -``` +```text registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ee:v14.7.0 registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ee:v14.7.0 registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ee:v14.7.0 @@ -197,6 +197,11 @@ registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ee:v14.7.0 ``` For a list of available tags you can browse the [GitLab Container Registry](https://gitlab.com/groups/gitlab-org/-/container_registries/). +From a terminal, you may use the [`skopeo`](https://github.com/containers/skopeo) tool instead: + +```shell +skopeo list-tags docker://registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ee +``` Note that the `gitaly`, `gitlab-shell` and `gitlab-runner` image tags should be separately updated to versions compatible with the GitLab version. -- GitLab From d9551184e6e32431ae6c6a83ae8dbe54889e820a Mon Sep 17 00:00:00 2001 From: Matthias Kaeppler Date: Tue, 28 Jun 2022 14:56:40 +0200 Subject: [PATCH 3/4] Fix lint error --- doc/charts/globals.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/charts/globals.md b/doc/charts/globals.md index a47c489911..5d86e0ecf3 100644 --- a/doc/charts/globals.md +++ b/doc/charts/globals.md @@ -189,7 +189,7 @@ the `global.gitlabVersion` key: This impacts the default image tag used in the `webservice`, `sidekiq`, and `migration` charts. The version set here will be resolved to the following images: -```text +```plaintext registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ee:v14.7.0 registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ee:v14.7.0 registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ee:v14.7.0 -- GitLab From fcdeb1cedd4c0ede43f04162027dff15d29d10fb Mon Sep 17 00:00:00 2001 From: Matthias Kaeppler Date: Tue, 28 Jun 2022 15:08:22 +0200 Subject: [PATCH 4/4] Use more direct language --- doc/charts/globals.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/charts/globals.md b/doc/charts/globals.md index 5d86e0ecf3..b690549bd2 100644 --- a/doc/charts/globals.md +++ b/doc/charts/globals.md @@ -187,7 +187,7 @@ the `global.gitlabVersion` key: ``` This impacts the default image tag used in the `webservice`, `sidekiq`, and `migration` -charts. The version set here will be resolved to the following images: +charts. The version set here is resolved to the following images: ```plaintext registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ee:v14.7.0 @@ -196,8 +196,8 @@ registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ee:v14.7.0 ... ``` -For a list of available tags you can browse the [GitLab Container Registry](https://gitlab.com/groups/gitlab-org/-/container_registries/). -From a terminal, you may use the [`skopeo`](https://github.com/containers/skopeo) tool instead: +For a list of available tags, browse the [GitLab Container Registry](https://gitlab.com/groups/gitlab-org/-/container_registries/). +From a terminal, use the [`skopeo`](https://github.com/containers/skopeo) tool instead: ```shell skopeo list-tags docker://registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ee @@ -207,7 +207,7 @@ Note that the `gitaly`, `gitlab-shell` and `gitlab-runner` image tags should be separately updated to versions compatible with the GitLab version. Similarly, if you wish to use images built from GitLab branches, which are published to different -image repositories, you will have to set `gitlab..image.repository` +image repositories, set `gitlab..image.repository` and `gitlab..image.tag` accordingly. The repository and tag can be obtained from the CI/CD logs of the merge request that triggered the build. -- GitLab