From a53334c3db548141f1c123e4fc0f7aa28d8db2b7 Mon Sep 17 00:00:00 2001 From: Michael Kozono Date: Thu, 18 Sep 2025 10:18:20 -1000 Subject: [PATCH] Remove FF geo_proxy_fetch_direct_to_primary_with_options Because the experiment was aborted. Ref: https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/1329 --- .../geo_proxy_fetch_direct_to_primary_with_options.yml | 8 -------- ee/lib/ee/gitlab/geo_git_access.rb | 3 --- ee/spec/lib/ee/gitlab/geo_git_access_spec.rb | 3 --- 3 files changed, 14 deletions(-) delete mode 100644 ee/config/feature_flags/development/geo_proxy_fetch_direct_to_primary_with_options.yml diff --git a/ee/config/feature_flags/development/geo_proxy_fetch_direct_to_primary_with_options.yml b/ee/config/feature_flags/development/geo_proxy_fetch_direct_to_primary_with_options.yml deleted file mode 100644 index 1e0cc9a65442b4..00000000000000 --- a/ee/config/feature_flags/development/geo_proxy_fetch_direct_to_primary_with_options.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: geo_proxy_fetch_direct_to_primary_with_options -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138777 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/434062 -milestone: '16.7' -type: development -group: group::geo -default_enabled: false diff --git a/ee/lib/ee/gitlab/geo_git_access.rb b/ee/lib/ee/gitlab/geo_git_access.rb index 0c856c3a8914ec..3f19a9928dd257 100644 --- a/ee/lib/ee/gitlab/geo_git_access.rb +++ b/ee/lib/ee/gitlab/geo_git_access.rb @@ -16,9 +16,6 @@ def geo_custom_ssh_action 'primary_repo' => primary_http_repo_internal_url, 'geo_proxy_direct_to_primary' => true, 'geo_proxy_fetch_direct_to_primary' => true, - 'geo_proxy_fetch_direct_to_primary_with_options' => ::Feature.enabled?( - :geo_proxy_fetch_direct_to_primary_with_options - ), 'geo_proxy_fetch_ssh_direct_to_primary' => ::Feature.enabled?( :geo_proxy_fetch_ssh_to_primary ), diff --git a/ee/spec/lib/ee/gitlab/geo_git_access_spec.rb b/ee/spec/lib/ee/gitlab/geo_git_access_spec.rb index e912036ca878d4..0d6120145df825 100644 --- a/ee/spec/lib/ee/gitlab/geo_git_access_spec.rb +++ b/ee/spec/lib/ee/gitlab/geo_git_access_spec.rb @@ -195,7 +195,6 @@ def initialize(actor, container, protocol, cmd, authentication_abilities: []) "primary_repo" => "http://primary.gitlab.com/#{project_no_repo.full_path}.git", "geo_proxy_direct_to_primary" => true, "geo_proxy_fetch_direct_to_primary" => true, - "geo_proxy_fetch_direct_to_primary_with_options" => true, "geo_proxy_fetch_ssh_direct_to_primary" => true, "geo_proxy_push_ssh_direct_to_primary" => true, "request_headers" => include('Authorization') @@ -292,7 +291,6 @@ def initialize(actor, container, protocol, cmd, authentication_abilities: []) "primary_repo" => "http://primary.gitlab.com/#{project.full_path}.git", "geo_proxy_direct_to_primary" => true, "geo_proxy_fetch_direct_to_primary" => true, - "geo_proxy_fetch_direct_to_primary_with_options" => true, "geo_proxy_fetch_ssh_direct_to_primary" => true, "geo_proxy_push_ssh_direct_to_primary" => true, "request_headers" => include('Authorization') @@ -339,7 +337,6 @@ def initialize(actor, container, protocol, cmd, authentication_abilities: []) "primary_repo" => "http://primary.gitlab.com/#{project.full_path}.git", "geo_proxy_direct_to_primary" => true, "geo_proxy_fetch_direct_to_primary" => true, - "geo_proxy_fetch_direct_to_primary_with_options" => true, "geo_proxy_fetch_ssh_direct_to_primary" => true, "geo_proxy_push_ssh_direct_to_primary" => true, "request_headers" => include('Authorization') -- GitLab