Commit 4d1a2873 authored by Michael Kozono's avatar Michael Kozono

Merge branch '353995-feature-flag-enable-geo_job_artifact_replication' into 'master'

Resolve "[Feature flag] Enable geo_job_artifact_replication"

See merge request gitlab-org/gitlab!82906
parents 1f6c3d73 4bc1a37e
...@@ -11024,7 +11024,7 @@ four standard [pagination arguments](#connection-pagination-arguments): ...@@ -11024,7 +11024,7 @@ four standard [pagination arguments](#connection-pagination-arguments):
##### `GeoNode.jobArtifactRegistries` ##### `GeoNode.jobArtifactRegistries`
Find Job Artifact registries on this Geo node Available only when feature flag `geo_job_artifact_replication` is enabled. This flag is disabled by default, because the feature is experimental and is subject to change without notice. Find Job Artifact registries on this Geo node.
Returns [`JobArtifactRegistryConnection`](#jobartifactregistryconnection). Returns [`JobArtifactRegistryConnection`](#jobartifactregistryconnection).
...@@ -19,8 +19,7 @@ module Types ...@@ -19,8 +19,7 @@ module Types
field :job_artifact_registries, ::Types::Geo::JobArtifactRegistryType.connection_type, field :job_artifact_registries, ::Types::Geo::JobArtifactRegistryType.connection_type,
null: true, null: true,
resolver: ::Resolvers::Geo::JobArtifactRegistriesResolver, resolver: ::Resolvers::Geo::JobArtifactRegistriesResolver,
description: 'Find Job Artifact registries on this Geo node', description: 'Find Job Artifact registries on this Geo node'
feature_flag: :geo_job_artifact_replication
field :lfs_object_registries, ::Types::Geo::LfsObjectRegistryType.connection_type, field :lfs_object_registries, ::Types::Geo::LfsObjectRegistryType.connection_type,
null: true, null: true,
resolver: ::Resolvers::Geo::LfsObjectRegistriesResolver, resolver: ::Resolvers::Geo::LfsObjectRegistriesResolver,
......
...@@ -13,12 +13,6 @@ module Geo ...@@ -13,12 +13,6 @@ module Geo
model_record.file model_record.file
end end
# The feature flag follows the format `geo_#{replicable_name}_replication`,
# so here it would be `geo_job_artifact_replication`
def self.replication_enabled_by_default?
false
end
override :verification_feature_flag_enabled? override :verification_feature_flag_enabled?
def self.verification_feature_flag_enabled? def self.verification_feature_flag_enabled?
# We are adding verification at the same time as replication, so we # We are adding verification at the same time as replication, so we
......
--- ---
name: geo_job_artifact_replication name: geo_job_artifact_replication
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/327400 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/327400
rollout_issue_url: rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353995
milestone: '14.8' milestone: '14.8'
type: development type: development
group: group::geo group: group::geo
default_enabled: false default_enabled: true
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment