Commit 2d18b08a authored by Michael Kozono's avatar Michael Kozono

Merge branch 'alexives/249176/enable_terraform_state_replication' into 'master'

Enable replication for terraform states versions by default

Closes #249176 and #254622

See merge request gitlab-org/gitlab!43367
parents 42100bb1 421649ee
...@@ -47,6 +47,8 @@ verification methods: ...@@ -47,6 +47,8 @@ verification methods:
| Blobs | Container registry _(object storage)_ | Geo with API/Managed/Docker API (*2*) | _Not implemented_ | | Blobs | Container registry _(object storage)_ | Geo with API/Managed/Docker API (*2*) | _Not implemented_ |
| Blobs | Package registry _(filesystem)_ | Geo with API | _Not implemented_ | | Blobs | Package registry _(filesystem)_ | Geo with API | _Not implemented_ |
| Blobs | Package registry _(object storage)_ | Geo with API/Managed (*2*) | _Not implemented_ | | Blobs | Package registry _(object storage)_ | Geo with API/Managed (*2*) | _Not implemented_ |
| Blobs | Versioned Terraform State _(filesystem)_ | Geo with API | _Not implemented_ |
| Blobs | Versioned Terraform State _(object storage)_ | Geo with API/Managed (*2*) | _Not implemented_ |
- (*1*): Redis replication can be used as part of HA with Redis sentinel. It's not used between Geo nodes. - (*1*): Redis replication can be used as part of HA with Redis sentinel. It's not used between Geo nodes.
- (*2*): Object storage replication can be performed by Geo or by your object storage provider/appliance - (*2*): Object storage replication can be performed by Geo or by your object storage provider/appliance
...@@ -185,7 +187,7 @@ successfully, you must replicate their data using some other means. ...@@ -185,7 +187,7 @@ successfully, you must replicate their data using some other means.
| [PyPi Repository](../../../user/packages/pypi_repository/index.md) | **Yes** (13.2) | No | Behind feature flag `geo_package_file_replication`, enabled by default | | [PyPi Repository](../../../user/packages/pypi_repository/index.md) | **Yes** (13.2) | No | Behind feature flag `geo_package_file_replication`, enabled by default |
| [Composer Repository](../../../user/packages/composer_repository/index.md) | **Yes** (13.2) | No | Behind feature flag `geo_package_file_replication`, enabled by default | | [Composer Repository](../../../user/packages/composer_repository/index.md) | **Yes** (13.2) | No | Behind feature flag `geo_package_file_replication`, enabled by default |
| [External merge request diffs](../../merge_request_diffs.md) | [No](https://gitlab.com/gitlab-org/gitlab/-/issues/33817) | No | | | [External merge request diffs](../../merge_request_diffs.md) | [No](https://gitlab.com/gitlab-org/gitlab/-/issues/33817) | No | |
| [Terraform State](../../terraform_state.md) | [No](https://gitlab.com/groups/gitlab-org/-/epics/3112)(*3*) | No | | | [Versioned Terraform State](../../terraform_state.md) | **Yes** (13.5) | No | |
| [Vulnerability Export](../../../user/application_security/security_dashboard/#export-vulnerabilities) | [No](https://gitlab.com/groups/gitlab-org/-/epics/3111)(*3*) | No | | | [Vulnerability Export](../../../user/application_security/security_dashboard/#export-vulnerabilities) | [No](https://gitlab.com/groups/gitlab-org/-/epics/3111)(*3*) | No | |
| Content in object storage | **Yes** (12.4) | No | | | Content in object storage | **Yes** (12.4) | No | |
......
...@@ -7032,8 +7032,7 @@ type GeoNode { ...@@ -7032,8 +7032,7 @@ type GeoNode {
): TerraformStateRegistryConnection ): TerraformStateRegistryConnection
""" """
Find terraform state version registries on this Geo node. Available only when Find terraform state version registries on this Geo node
feature flag `geo_terraform_state_version_replication` is enabled
""" """
terraformStateVersionRegistries( terraformStateVersionRegistries(
""" """
......
...@@ -19493,7 +19493,7 @@ ...@@ -19493,7 +19493,7 @@
}, },
{ {
"name": "terraformStateVersionRegistries", "name": "terraformStateVersionRegistries",
"description": "Find terraform state version registries on this Geo node. Available only when feature flag `geo_terraform_state_version_replication` is enabled", "description": "Find terraform state version registries on this Geo node",
"args": [ "args": [
{ {
"name": "ids", "name": "ids",
...@@ -39,8 +39,7 @@ module Types ...@@ -39,8 +39,7 @@ module Types
field :terraform_state_version_registries, ::Types::Geo::TerraformStateVersionRegistryType.connection_type, field :terraform_state_version_registries, ::Types::Geo::TerraformStateVersionRegistryType.connection_type,
null: true, null: true,
resolver: ::Resolvers::Geo::TerraformStateVersionRegistriesResolver, resolver: ::Resolvers::Geo::TerraformStateVersionRegistriesResolver,
description: 'Find terraform state version registries on this Geo node', description: 'Find terraform state version registries on this Geo node'
feature_flag: :geo_terraform_state_version_replication
end end
end end
end end
...@@ -11,10 +11,5 @@ module Geo ...@@ -11,10 +11,5 @@ module Geo
def self.model def self.model
::Terraform::StateVersion ::Terraform::StateVersion
end end
# Remove with https://gitlab.com/gitlab-org/gitlab/-/issues/249176
def self.replication_enabled_by_default?
false
end
end end
end end
---
title: Enable geo replication of versioned terraform state
merge_request: 43367
author:
type: added
...@@ -4,4 +4,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42529 ...@@ -4,4 +4,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42529
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/254622 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/254622
group: group::geo group: group::geo
type: development type: development
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