Add flag for object storage synchronization to Geo Nodes

This is a configuration flag that controls when a Geo node will
synchronize Object Storage. Default is false.

ee/app/assets/javascripts/pages/admin/geo/nodes/shared/init_form.js

@@ -22,7 +22,7 @@ export default function geoNodeForm() {
   const $container = $('.js-geo-node-form');
   const $namespaces = $('.js-hide-if-geo-primary', $container);
   const $reverification = $('.js-hide-if-geo-secondary', $container);
-  const $primaryCheckbox = $('input[type="checkbox"]', $container);
+  const $primaryCheckbox = $('input#geo_node_primary', $container);
   const $selectiveSyncTypeSelect = $('.js-geo-node-selective-sync-type', $container);
   const $select2Dropdown = $('.js-geo-node-namespaces', $container);
   const $syncByNamespaces = $('.js-sync-by-namespace', $container);

ee/app/controllers/admin/geo/nodes_controller.rb

@@ -58,6 +58,7 @@ class Admin::Geo::NodesController < Admin::Geo::ApplicationController
       :verification_max_capacity,
       :minimum_reverification_interval,
       :container_repositories_max_capacity,
+      :sync_object_storage,
       selective_sync_shards: []
     )
   end

ee/app/views/admin/geo/nodes/_form.html.haml

@@ -10,12 +10,6 @@
     = form.text_field :url, class: 'form-control qa-node-url-field'
     .form-text.text-muted= _('The user-facing URL of the Geo node')
 
-  .form-group.col-sm-6.js-internal-url{ class: ('hidden' unless geo_node.primary?) }
-    = form.label :internal_url, s_('Geo|Internal URL (optional)'), class: 'font-weight-bold'
-    = form.text_field :internal_url, class: 'form-control'
-    .form-text.text-muted= s_('Geo|The URL defined on the primary node that secondary nodes should use to contact it. Defaults to URL')
-
-
 .form-group.row
   .col-sm-10
     .form-check
@@ -23,6 +17,12 @@
       = form.label :primary, class: 'form-check-label' do
         %span= s_('Geo|This is a primary node')
 
+.form-row.form-group.js-internal-url{ class: ('hidden' unless geo_node.primary?) }
+  .col-sm-6
+    = form.label :internal_url, s_('Geo|Internal URL (optional)'), class: 'font-weight-bold'
+    = form.text_field :internal_url, class: 'form-control'
+    .form-text.text-muted= s_('Geo|The URL defined on the primary node that secondary nodes should use to contact it. Defaults to URL')
+
 .form-row.form-group.js-hide-if-geo-primary{ class: ('hidden' unless geo_node.secondary?) }
   .col-sm-4
     = form.label :selective_sync_type, s_('Geo|Selective synchronization'), class: 'font-weight-bold'
@@ -69,3 +69,13 @@
     = form.label :minimum_reverification_interval, s_('Geo|Re-verification interval'), class: 'font-weight-bold'
     = form.number_field :minimum_reverification_interval, class: 'form-control col-sm-2', min: 1
     .form-text.text-muted= s_('Geo|Control the minimum interval in days that a repository should be reverified for this primary node')
+
+.form-group.row.js-hide-if-geo-primary{ class: ('hidden' unless geo_node.secondary?) }
+  .col-sm-10
+    = form.label :sync_object_storage, _('Object Storage replication'), class: 'label-bold'
+    .form-check
+      = form.check_box :sync_object_storage, class: 'form-check-input'
+      = form.label :sync_object_storage, class: 'form-check-label' do
+        %span= s_('Geo|Allow GitLab to replicate content on Object Storage')
+      .form-text.text-muted= s_('Geo|If enabled, GitLab will perform Object Storage replication using Geo')
+

ee/changelogs/unreleased/10586-make-object-storage-replication-configurable.yml

+---
+title: 'Geo: Make Object Storage synchronization in Geo Nodes configurable via Admin UI'
+merge_request: 15000
+author:
+type: added

ee/spec/factories/geo_nodes.rb

@@ -9,10 +9,12 @@ FactoryBot.define do
     end
 
     primary false
+    sync_object_storage true
 
     trait :primary do
       primary true
       minimum_reverification_interval 7
+      sync_object_storage false
     end
   end
 end

ee/spec/features/admin/geo/admin_geo_nodes_spec.rb

@@ -89,16 +89,48 @@ describe 'admin Geo Nodes', :js, :geo do
       end
     end
 
-    it 'changes re-verification interval field visibility based on primary node checkbox' do
-      expect(page).not_to have_field('Re-verification interval')
+    it 'toggles the visibility of secondary only params based on primary node checkbox' do
+      primary_only_fields = [
+        'Internal URL (optional)',
+        'Re-verification interval'
+      ]
+
+      secondary_only_fields = [
+        'Selective synchronization',
+        'Repository sync capacity',
+        'File sync capacity',
+        'Object Storage replication'
+      ]
+
+      expect(page).to have_unchecked_field('This is a primary node')
+
+      primary_only_fields.each do |field|
+        expect(page).to have_field(field, visible: false)
+      end
+
+      secondary_only_fields.each do |field|
+        expect(page).to have_field(field)
+      end
 
       check 'This is a primary node'
 
-      expect(page).to have_field('Re-verification interval')
+      primary_only_fields.each do |field|
+        expect(page).to have_field(field)
+      end
+
+      secondary_only_fields.each do |field|
+        expect(page).to have_field(field, visible: false)
+      end
 
       uncheck 'This is a primary node'
 
-      expect(page).not_to have_field('Re-verification interval')
+      primary_only_fields.each do |field|
+        expect(page).to have_field(field, visible: false)
+      end
+
+      secondary_only_fields.each do |field|
+        expect(page).to have_field(field)
+      end
     end
 
     it 'returns an error message when a duplicate primary is added' do

locale/gitlab.pot

@@ -6814,6 +6814,9 @@ msgstr ""
 msgid "Geo|All projects are being scheduled for re-verify"
 msgstr ""
 
+msgid "Geo|Allow GitLab to replicate content on Object Storage"
+msgstr ""
+
 msgid "Geo|Batch operations"
 msgstr ""
 
@@ -6853,6 +6856,9 @@ msgstr ""
 msgid "Geo|Groups to synchronize"
 msgstr ""
 
+msgid "Geo|If enabled, GitLab will perform Object Storage replication using Geo"
+msgstr ""
+
 msgid "Geo|In sync"
 msgstr ""
 
@@ -10106,6 +10112,9 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
+msgid "Object Storage replication"
+msgstr ""
+
 msgid "Object does not exist on the server or you don't have permissions to access it"
 msgstr ""