Merge branch '438975-remove-ignore-rule-for-legacy-columns-from-geonodestatus-model' into 'master'

Geo - Remove ignore column rule from GeoNodeStatus

See merge request !148335



Merged-by: Tiger Watson <twatson@gitlab.com>
Approved-by: Malcolm Locke <mlocke@gitlab.com>
Approved-by: Bojan Marjanovic <bmarjanovic@gitlab.com>
Approved-by: Imre Farkas <ifarkas@gitlab.com>
Approved-by: Tiger Watson <twatson@gitlab.com>
Co-authored-by: Douglas Barbosa Alexandre <dbalexandre@gmail.com>

ee/app/models/geo_node_status.rb

 # frozen_string_literal: true
 
 class GeoNodeStatus < ApplicationRecord
-  include IgnorableColumns
   include ShaAttribute
 
-  ignore_columns(
-    %i[
-      container_repositories_count
-      container_repositories_failed_count
-      container_repositories_registry_count
-      container_repositories_synced_count
-      job_artifacts_count
-      job_artifacts_failed_count
-      job_artifacts_synced_count
-      job_artifacts_synced_missing_on_primary_count
-      lfs_objects_count
-      lfs_objects_failed_count
-      lfs_objects_synced_count
-      lfs_objects_synced_missing_on_primary_count
-    ],
-    remove_with: '16.7',
-    remove_after: '2023-11-22'
-  )
-
   belongs_to :geo_node
 
   delegate :selective_sync_type, to: :geo_node

ee/lib/gitlab/geo/geo_node_status_check.rb

@@ -24,7 +24,6 @@ def print_status
         print_geo_role
         print_node_health_status
 
-        print_container_repositories_status
         print_replicators_status
         print_repositories_checked_status
         print_replicators_verification_status
@@ -38,7 +37,6 @@ def print_status
       end
 
       def print_replication_verification_status
-        print_container_repositories_status
         print_replicators_status
         print_replicators_verification_status
       end
@@ -73,10 +71,6 @@ def conditional_replication_and_verification_checks_status
               !Gitlab::Geo.secondary?
             status.push current_node_status.repositories_checked_in_percentage
           end
-
-          if ::Geo::ContainerRepositoryRegistry.replication_enabled? && current_node_status.container_repositories_count.to_i > 0
-            status.push current_node_status.container_repositories_synced_in_percentage
-          end
         end
       end
 
@@ -180,18 +174,6 @@ def print_replicators_status
         end
       end
 
-      def print_container_repositories_status
-        if ::Geo::ContainerRepositoryRegistry.replication_enabled?
-          print_counts_row(
-            description: 'Container repositories',
-            failed: current_node_status.container_repositories_failed_count,
-            succeeded: current_node_status.container_repositories_synced_count,
-            total: current_node_status.container_repositories_count,
-            percentage: current_node_status.container_repositories_synced_in_percentage
-          )
-        end
-      end
-
       def print_repositories_checked_status
         return unless Gitlab::Geo.primary?
         return unless Gitlab::CurrentSettings.repository_checks_enabled

ee/spec/tasks/geo_rake_spec.rb

@@ -179,8 +179,6 @@
             /Health Status: /,
             /Sync Settings: /,
             /Database replication lag: /,
-            /Uploads: /,
-            /Container repositories: /,
             /Last event ID seen from primary: /,
             /Last status report was: /
           ] + self_service_framework_checks