From 3b375bc47ce68e9b0885003aed367627373bad30 Mon Sep 17 00:00:00 2001 From: Saan A Date: Sat, 16 Dec 2023 18:02:01 +0000 Subject: [PATCH 1/9] Updates dep proxy value to true --- charts/gitlab/charts/webservice/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/gitlab/charts/webservice/values.yaml b/charts/gitlab/charts/webservice/values.yaml index 951a44d0d7..5dffff7c06 100644 --- a/charts/gitlab/charts/webservice/values.yaml +++ b/charts/gitlab/charts/webservice/values.yaml @@ -351,7 +351,7 @@ global: bucket: connection: {} dependencyProxy: - enabled: false + enabled: true proxy_download: true bucket: connection: {} -- GitLab From 9d9ecb0c2f92208663456db370f049659736eb63 Mon Sep 17 00:00:00 2001 From: Saan A Date: Mon, 18 Dec 2023 17:37:22 +0000 Subject: [PATCH 2/9] Enable dep proxy by default globally --- values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values.yaml b/values.yaml index 185bd1ac9e..273e70efb0 100644 --- a/values.yaml +++ b/values.yaml @@ -385,7 +385,7 @@ global: bucket: gitlab-ci-secure-files connection: {} dependencyProxy: - enabled: false + enabled: true proxy_download: true bucket: gitlab-dependency-proxy connection: {} -- GitLab From 862e3d513112cc3bbff0a63e8b96ca0375fa6f32 Mon Sep 17 00:00:00 2001 From: Saan A Date: Wed, 20 Dec 2023 17:55:08 +0000 Subject: [PATCH 3/9] Simplifies dep proxy to supportive case --- spec/configuration/objectstorage_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/configuration/objectstorage_spec.rb b/spec/configuration/objectstorage_spec.rb index aceb5715ee..e9b0061add 100644 --- a/spec/configuration/objectstorage_spec.rb +++ b/spec/configuration/objectstorage_spec.rb @@ -210,7 +210,7 @@ describe 'ObjectStorage configuration' do global: appConfig: dependencyProxy: - enabled: true + enabled: false )).deep_merge(default_values) end -- GitLab From bf1c8a7bc57bbb1502ff804aedd7501e4f85a5ed Mon Sep 17 00:00:00 2001 From: Saan A Date: Thu, 21 Dec 2023 04:59:25 +0000 Subject: [PATCH 4/9] Reverts the change for spec case --- spec/configuration/objectstorage_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/configuration/objectstorage_spec.rb b/spec/configuration/objectstorage_spec.rb index e9b0061add..aceb5715ee 100644 --- a/spec/configuration/objectstorage_spec.rb +++ b/spec/configuration/objectstorage_spec.rb @@ -210,7 +210,7 @@ describe 'ObjectStorage configuration' do global: appConfig: dependencyProxy: - enabled: false + enabled: true )).deep_merge(default_values) end -- GitLab From b2b1fa8a53eb3e283699045f20726a52db123600 Mon Sep 17 00:00:00 2001 From: Saan A Date: Wed, 3 Jan 2024 07:06:46 +0000 Subject: [PATCH 5/9] Changes it block for enabled true --- spec/configuration/objectstorage_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/configuration/objectstorage_spec.rb b/spec/configuration/objectstorage_spec.rb index aceb5715ee..5df1757a38 100644 --- a/spec/configuration/objectstorage_spec.rb +++ b/spec/configuration/objectstorage_spec.rb @@ -215,11 +215,11 @@ describe 'ObjectStorage configuration' do end context 'when true' do - it 'does not populate connection block' do + it 'populates connection block' do t = HelmTemplate.new(values_dependencyProxy_enabled) expect(t.exit_code).to eq(0) services.each do |cm| - expect(t.dig("ConfigMap/test-#{cm}", 'data', 'gitlab.yml.erb')).not_to include(objectstorage_config_file) + expect(t.dig("ConfigMap/test-#{cm}", 'data', 'gitlab.yml.erb')).to include(objectstorage_config_file) end end -- GitLab From 722a858107ab387ac830090fe93d4c922d555e61 Mon Sep 17 00:00:00 2001 From: Saan A Date: Wed, 3 Jan 2024 08:08:36 +0000 Subject: [PATCH 6/9] Updates to value_depen --- spec/configuration/objectstorage_spec.rb | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/spec/configuration/objectstorage_spec.rb b/spec/configuration/objectstorage_spec.rb index 5df1757a38..07d4799c08 100644 --- a/spec/configuration/objectstorage_spec.rb +++ b/spec/configuration/objectstorage_spec.rb @@ -222,16 +222,6 @@ describe 'ObjectStorage configuration' do expect(t.dig("ConfigMap/test-#{cm}", 'data', 'gitlab.yml.erb')).to include(objectstorage_config_file) end end - - context 'with connection configuration provided' do - it 'populates connection block' do - t = HelmTemplate.new(values_dependencyProxy_enabled.deep_merge(values_dependencyProxy_connection)) - expect(t.exit_code).to eq(0) - services.each do |cm| - expect(t.dig("ConfigMap/test-#{cm}", 'data', 'gitlab.yml.erb')).to include(objectstorage_config_file) - end - end - end end context 'when false' do @@ -245,7 +235,7 @@ describe 'ObjectStorage configuration' do context 'with connection configuration provided' do it 'does not populate connection block' do - t = HelmTemplate.new(values_dependencyProxy_connection) + t = HelmTemplate.new(values_dependencyProxy_enabled.deep_merge(values_dependencyProxy_connection)) expect(t.exit_code).to eq(0) services.each do |cm| expect(t.dig("ConfigMap/test-#{cm}", 'data', 'gitlab.yml.erb')).not_to include(objectstorage_config_file) -- GitLab From 1f9a763435f2352abdd8052fd3ed89cb106cd7c7 Mon Sep 17 00:00:00 2001 From: Saan A Date: Wed, 3 Jan 2024 10:04:20 +0000 Subject: [PATCH 7/9] Modifies for conn block --- spec/configuration/objectstorage_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/configuration/objectstorage_spec.rb b/spec/configuration/objectstorage_spec.rb index 07d4799c08..956ebd7391 100644 --- a/spec/configuration/objectstorage_spec.rb +++ b/spec/configuration/objectstorage_spec.rb @@ -216,14 +216,14 @@ describe 'ObjectStorage configuration' do context 'when true' do it 'populates connection block' do - t = HelmTemplate.new(values_dependencyProxy_enabled) + t = HelmTemplate.new(values_dependencyProxy_enabled.deep_merge(values_dependencyProxy_connection)) expect(t.exit_code).to eq(0) services.each do |cm| expect(t.dig("ConfigMap/test-#{cm}", 'data', 'gitlab.yml.erb')).to include(objectstorage_config_file) end end end - + context 'when false' do it 'does not populate connection block' do t = HelmTemplate.new(default_values) @@ -232,10 +232,10 @@ describe 'ObjectStorage configuration' do expect(t.dig("ConfigMap/test-#{cm}", 'data', 'gitlab.yml.erb')).not_to include(objectstorage_config_file) end end - + context 'with connection configuration provided' do it 'does not populate connection block' do - t = HelmTemplate.new(values_dependencyProxy_enabled.deep_merge(values_dependencyProxy_connection)) + t = HelmTemplate.new(values_dependencyProxy_connection) expect(t.exit_code).to eq(0) services.each do |cm| expect(t.dig("ConfigMap/test-#{cm}", 'data', 'gitlab.yml.erb')).not_to include(objectstorage_config_file) -- GitLab From f055071b9179d48e352e69fef93cfc9078d8a4ca Mon Sep 17 00:00:00 2001 From: Saan A Date: Wed, 3 Jan 2024 13:04:49 +0000 Subject: [PATCH 8/9] Reverts the change for spec test --- spec/configuration/objectstorage_spec.rb | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/spec/configuration/objectstorage_spec.rb b/spec/configuration/objectstorage_spec.rb index 956ebd7391..aceb5715ee 100644 --- a/spec/configuration/objectstorage_spec.rb +++ b/spec/configuration/objectstorage_spec.rb @@ -215,15 +215,25 @@ describe 'ObjectStorage configuration' do end context 'when true' do - it 'populates connection block' do - t = HelmTemplate.new(values_dependencyProxy_enabled.deep_merge(values_dependencyProxy_connection)) + it 'does not populate connection block' do + t = HelmTemplate.new(values_dependencyProxy_enabled) expect(t.exit_code).to eq(0) services.each do |cm| - expect(t.dig("ConfigMap/test-#{cm}", 'data', 'gitlab.yml.erb')).to include(objectstorage_config_file) + expect(t.dig("ConfigMap/test-#{cm}", 'data', 'gitlab.yml.erb')).not_to include(objectstorage_config_file) + end + end + + context 'with connection configuration provided' do + it 'populates connection block' do + t = HelmTemplate.new(values_dependencyProxy_enabled.deep_merge(values_dependencyProxy_connection)) + expect(t.exit_code).to eq(0) + services.each do |cm| + expect(t.dig("ConfigMap/test-#{cm}", 'data', 'gitlab.yml.erb')).to include(objectstorage_config_file) + end end end end - + context 'when false' do it 'does not populate connection block' do t = HelmTemplate.new(default_values) @@ -232,7 +242,7 @@ describe 'ObjectStorage configuration' do expect(t.dig("ConfigMap/test-#{cm}", 'data', 'gitlab.yml.erb')).not_to include(objectstorage_config_file) end end - + context 'with connection configuration provided' do it 'does not populate connection block' do t = HelmTemplate.new(values_dependencyProxy_connection) -- GitLab From 3d0cc837a89b828be75ec7c26a82e55a8f063629 Mon Sep 17 00:00:00 2001 From: Saan A Date: Mon, 22 Jan 2024 10:29:20 +0000 Subject: [PATCH 9/9] Single out dependencyProxy from chart docs --- charts/gitlab/charts/webservice/values.yaml | 2 +- doc/charts/globals.md | 4 ---- values.yaml | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/charts/gitlab/charts/webservice/values.yaml b/charts/gitlab/charts/webservice/values.yaml index 5dffff7c06..951a44d0d7 100644 --- a/charts/gitlab/charts/webservice/values.yaml +++ b/charts/gitlab/charts/webservice/values.yaml @@ -351,7 +351,7 @@ global: bucket: connection: {} dependencyProxy: - enabled: true + enabled: false proxy_download: true bucket: connection: {} diff --git a/doc/charts/globals.md b/doc/charts/globals.md index 211983409a..73f2729ee1 100644 --- a/doc/charts/globals.md +++ b/doc/charts/globals.md @@ -984,10 +984,6 @@ global: enabled: false bucket: gitlab-ci-secure-files connection: {} - dependencyProxy: - enabled: false - bucket: gitlab-dependency-proxy - connection: {} backups: bucket: gitlab-backups microsoft_graph_mailer: diff --git a/values.yaml b/values.yaml index 273e70efb0..185bd1ac9e 100644 --- a/values.yaml +++ b/values.yaml @@ -385,7 +385,7 @@ global: bucket: gitlab-ci-secure-files connection: {} dependencyProxy: - enabled: true + enabled: false proxy_download: true bucket: gitlab-dependency-proxy connection: {} -- GitLab