Skip to content

Geo 2.0 Regression - Add ability to remove primary

Zack Cuddy requested to merge 338231-fix-geo-removal-logic into master

What does this MR do?

Closes #338231 (closed)

This is the fix for a UI bug that came to be after our recent Geo redesign. In the UI a Primary node should be able to be removed if all the secondary nodes are first removed. However, the UI always disabled the ability to remove the primary node.

This change adds a getter to tell the components if they can/cannot remove a node.

Screenshots or Screencasts (strongly suggested)

Removing Nodes Removing Nodes

https://docs.gitlab.com/ee/administration/geo/replication/disable_geo.html#remove-the-primary-site-from-the-ui

Before After
Docs_Before Docs_After

https://docs.gitlab.com/ee/administration/geo/replication/version_specific_updates.html

Before After
N/A Update_Instructions

How to setup and validate locally (strongly suggested)

  1. Set up Geo on your GDK
  2. Fetch/Checkout this branch on your Primary Node (gdk-primary)
  3. Navigate to the Geo Nodes UI http://127.0.0.1:3000/admin/geo/nodes.
  4. Ensure Primary node cannot be removed if secondaries exist
  5. Ensure Secondary node(s) can be removed
  6. Remove all secondary nodes
  7. Ensure Primary node can now be removed

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

Security

Does this MR contain changes to processing or storing of credentials or tokens, authorization and authentication methods or other items described in the security review guidelines? If not, then delete this Security section.

  • [-] Label as security and @ mention @gitlab-com/gl-security/appsec
  • [-] The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • [-] Security reports checked/validated by a reviewer from the AppSec team

Related to #338231 (closed)

Edited by Zack Cuddy

Merge request reports