From 12d71eb04632f64c89e40a41904d16b2e91710fc Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Fri, 25 Aug 2023 04:40:37 +0000 Subject: [PATCH 1/6] Enable Terraform state and dependency proxy object storage by default --- values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/values.yaml b/values.yaml index 7a3da8cfac..0cb9224d75 100644 --- a/values.yaml +++ b/values.yaml @@ -355,7 +355,7 @@ global: bucket: gitlab-mr-diffs connection: {} terraformState: - enabled: false + enabled: true bucket: gitlab-terraform-state connection: {} ciSecureFiles: @@ -363,7 +363,7 @@ global: bucket: gitlab-ci-secure-files connection: {} dependencyProxy: - enabled: false + enabled: true proxy_download: true bucket: gitlab-dependency-proxy connection: {} -- GitLab From 0f3b4ec7c6b3f565b8fc99facbd7b8b2685b7a55 Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Fri, 25 Aug 2023 04:41:43 +0000 Subject: [PATCH 2/6] Update file globals.md --- 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 f98d58f748..7d4ca529e5 100644 --- a/doc/charts/globals.md +++ b/doc/charts/globals.md @@ -1237,7 +1237,7 @@ as they are structurally identical aside from the default value of the `bucket` | Name | Type | Default | Description | |:---------------- |:-------:|:------- |:----------- | -| `enabled` | Boolean | Defaults to `true` for LFS, artifacts, uploads, and packages | Enable the use of these features with object storage. | +| `enabled` | Boolean | Defaults to `true` for LFS, artifacts, uploads, packages, Terraform state, and dependency proxy | Enable the use of these features with object storage. | | `proxy_download` | Boolean | `true` | Enable proxy of all downloads via GitLab, in place of direct downloads from the `bucket`. | | `bucket` | String | Various | Name of the bucket to use from object storage provider. Default will be `git-lfs`, `gitlab-artifacts`, `gitlab-uploads`, or `gitlab-packages`, depending on the service. | | `connection` | String | `{}` | [See below](#connection). | -- GitLab From f9c74ac1ff802acd4c253dc0d60daa7cf9a93c96 Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Fri, 25 Aug 2023 04:43:25 +0000 Subject: [PATCH 3/6] Update file globals.md --- 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 7d4ca529e5..1ba1928a43 100644 --- a/doc/charts/globals.md +++ b/doc/charts/globals.md @@ -2431,7 +2431,7 @@ Setting pod priority allows you to tell the scheduler to evict lower priority po ```yaml global: priorityClassName: system-cluster-critical -``` +``` | Name | Type | Default | Description | | :-------------------| :--: | :------ | :------------------------------- | -- GitLab From 8e010b930ca7528062d2d05145bf065700919ef2 Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Fri, 25 Aug 2023 04:44:04 +0000 Subject: [PATCH 4/6] Enable Terraform state and dependency proxy object storage by default Changelog: added --- 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 1ba1928a43..7d4ca529e5 100644 --- a/doc/charts/globals.md +++ b/doc/charts/globals.md @@ -2431,7 +2431,7 @@ Setting pod priority allows you to tell the scheduler to evict lower priority po ```yaml global: priorityClassName: system-cluster-critical -``` +``` | Name | Type | Default | Description | | :-------------------| :--: | :------ | :------------------------------- | -- GitLab From 9a44f75ef651fec3d2a2994aa9b00f5f73e854a5 Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Thu, 31 Aug 2023 01:39:24 +0000 Subject: [PATCH 5/6] Update 5 files - /charts/gitlab/charts/sidekiq/values.yaml - /charts/gitlab/charts/toolbox/values.yaml - /charts/gitlab/charts/webservice/values.yaml - /examples/ubi/values.yaml - /examples/fips/values.yaml --- charts/gitlab/charts/sidekiq/values.yaml | 4 ++-- charts/gitlab/charts/toolbox/values.yaml | 4 ++-- charts/gitlab/charts/webservice/values.yaml | 4 ++-- examples/fips/values.yaml | 10 ++++++++++ examples/ubi/values.yaml | 10 ++++++++++ 5 files changed, 26 insertions(+), 6 deletions(-) diff --git a/charts/gitlab/charts/sidekiq/values.yaml b/charts/gitlab/charts/sidekiq/values.yaml index 7b47076c73..7d1cc0d606 100644 --- a/charts/gitlab/charts/sidekiq/values.yaml +++ b/charts/gitlab/charts/sidekiq/values.yaml @@ -168,11 +168,11 @@ global: bucket: connection: {} terraformState: - enabled: false + enabled: true bucket: connection: {} dependencyProxy: - enabled: false + enabled: true proxy_download: true bucket: connection: {} diff --git a/charts/gitlab/charts/toolbox/values.yaml b/charts/gitlab/charts/toolbox/values.yaml index e35be24bb9..52ef300195 100644 --- a/charts/gitlab/charts/toolbox/values.yaml +++ b/charts/gitlab/charts/toolbox/values.yaml @@ -100,11 +100,11 @@ global: bucket: connection: {} terraformState: - enabled: false + enabled: true bucket: connection: {} dependencyProxy: - enabled: false + enabled: true proxy_download: true bucket: connection: {} diff --git a/charts/gitlab/charts/webservice/values.yaml b/charts/gitlab/charts/webservice/values.yaml index 951a44d0d7..092d7a0766 100644 --- a/charts/gitlab/charts/webservice/values.yaml +++ b/charts/gitlab/charts/webservice/values.yaml @@ -347,11 +347,11 @@ global: bucket: connection: {} terraformState: - enabled: false + enabled: true bucket: connection: {} dependencyProxy: - enabled: false + enabled: true proxy_download: true bucket: connection: {} diff --git a/examples/fips/values.yaml b/examples/fips/values.yaml index f4603fcaf8..1c98275df8 100644 --- a/examples/fips/values.yaml +++ b/examples/fips/values.yaml @@ -84,6 +84,16 @@ global: connection: secret: my-objectstore-packages-secret # Package storage secret. key: connection + terraformState: + bucket: my-terraformstate-storage # Terraform state storage bucket. + connection: + secret: my-objectstore-terraformstate-secret # Terraform state storage secret. + key: connection + dependencyProxy: + bucket: my-dependencyproxy-storage # Dependency proxy storage bucket. + connection: + secret: my-objectstore-dependencyproxy-secret # Dependency proxy storage secret. + key: connection backups: bucket: my-backup-storage # Backup storage bucket. tmpBucket: my-tmp-storage # Temp storage bucket. diff --git a/examples/ubi/values.yaml b/examples/ubi/values.yaml index fb0b617e3d..b6bee56413 100644 --- a/examples/ubi/values.yaml +++ b/examples/ubi/values.yaml @@ -84,6 +84,16 @@ global: connection: secret: my-objectstore-packages-secret # Package storage secret. key: connection + terraformState: + bucket: my-terraformstate-storage # Terraform state storage bucket. + connection: + secret: my-objectstore-terraformstate-secret # Terraform state storage secret. + key: connection + dependencyProxy: + bucket: my-dependencyproxy-storage # Dependency proxy storage bucket. + connection: + secret: my-objectstore-dependencyproxy-secret # Dependency proxy storage secret. + key: connection backups: bucket: my-backup-storage # Backup storage bucket. tmpBucket: my-tmp-storage # Temp storage bucket. -- GitLab From b1db5a158841c2add6c2c6548cd880ba28faec1e Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Thu, 31 Aug 2023 01:44:26 +0000 Subject: [PATCH 6/6] Update file values-external-objectstorage.yaml --- examples/values-external-objectstorage.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/examples/values-external-objectstorage.yaml b/examples/values-external-objectstorage.yaml index a2e7ec2d42..602ad7a768 100644 --- a/examples/values-external-objectstorage.yaml +++ b/examples/values-external-objectstorage.yaml @@ -26,6 +26,16 @@ global: connection: secret: objectstore-packages key: connection + terraformState: + bucket: gitlab-terraformstate-storage + connection: + secret: objectstore-terraformstate + key: connection + dependencyProxy: + bucket: gitlab-dependencyproxy-storage + connection: + secret: objectstore-dependencyproxy + key: connection backups: bucket: gitlab-backup-storage tmpBucket: gitlab-tmp-storage -- GitLab